From 6d64f7ae156c6a93e37f634d8cdfb7734b2440c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Borecki?=
Date: Thu, 22 Aug 2019 04:13:43 +0200
Subject: [PATCH] Added orientation support for QProgressBar
---
src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp | 9 +++++++++
src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h | 1 +
src/lib/QtEnums/index.ts | 5 +++++
src/lib/QtWidgets/QProgressBar/index.ts | 5 +++++
4 files changed, 20 insertions(+)
diff --git a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp
index 2152f401a..36aba7440 100644
--- a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp
+++ b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp
@@ -14,6 +14,7 @@ Napi::Object QProgressBarWrap::init(Napi::Env env, Napi::Object exports) {
InstanceMethod("setValue", &QProgressBarWrap::setValue),
InstanceMethod("setMaximum", &QProgressBarWrap::setMaximum),
InstanceMethod("setMinimum", &QProgressBarWrap::setMinimum),
+ InstanceMethod("setOrientation", &QProgressBarWrap::setOrientation),
InstanceMethod("value", &QProgressBarWrap::value),
QWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QProgressBarWrap)
});
@@ -71,6 +72,14 @@ Napi::Value QProgressBarWrap::setMinimum(const Napi::CallbackInfo& info) {
return env.Null();
}
+Napi::Value QProgressBarWrap::setOrientation(const Napi::CallbackInfo& info) {
+ Napi::Env env = info.Env();
+ Napi::HandleScope scope(env);
+ Napi::Number value = info[0].As();
+ this->instance->setOrientation(static_cast(value.Int32Value()));
+ return env.Null();
+}
+
Napi::Value QProgressBarWrap::value(const Napi::CallbackInfo& info) {
Napi::Env env = info.Env();
Napi::HandleScope scope(env);
diff --git a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h
index 3e7e885ba..460be760c 100644
--- a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h
+++ b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h
@@ -18,6 +18,7 @@ class QProgressBarWrap : public Napi::ObjectWrap{
Napi::Value setValue(const Napi::CallbackInfo& info);
Napi::Value setMaximum(const Napi::CallbackInfo& info);
Napi::Value setMinimum(const Napi::CallbackInfo& info);
+ Napi::Value setOrientation(const Napi::CallbackInfo& info);
Napi::Value value(const Napi::CallbackInfo& info);
QWIDGET_WRAPPED_METHODS_DECLARATION
diff --git a/src/lib/QtEnums/index.ts b/src/lib/QtEnums/index.ts
index 76edd3520..90ea573f7 100644
--- a/src/lib/QtEnums/index.ts
+++ b/src/lib/QtEnums/index.ts
@@ -124,3 +124,8 @@ export enum WidgetAttribute {
WA_AlwaysStackOnTop = 128,
WA_ContentsMarginsRespectsSafeArea = 13
}
+
+export enum Orientation {
+ Horizontal = 1,
+ Vertical = 2
+}
\ No newline at end of file
diff --git a/src/lib/QtWidgets/QProgressBar/index.ts b/src/lib/QtWidgets/QProgressBar/index.ts
index e879491ca..dfb94b281 100644
--- a/src/lib/QtWidgets/QProgressBar/index.ts
+++ b/src/lib/QtWidgets/QProgressBar/index.ts
@@ -2,6 +2,7 @@ import addon from "../../core/addon";
import { NodeWidget } from "../../QtGui/QWidget";
import { BaseWidgetEvents } from "../../core/EventWidget";
import { NativeElement } from "../../core/Component";
+import { Orientation } from "../../QtEnums";
export const QProgressBarEvents = Object.freeze({
...BaseWidgetEvents
@@ -22,6 +23,7 @@ export class QProgressBar extends NodeWidget {
this.setValue.bind(this);
this.setMinimum.bind(this);
this.setMaximum.bind(this);
+ this.setOrientation.bind(this);
this.value.bind(this);
}
setValue(value: number) {
@@ -33,6 +35,9 @@ export class QProgressBar extends NodeWidget {
setMaximum(max: number) {
this.native.setMaximum(max);
}
+ setOrientation(orientation: Orientation) {
+ this.native.setOrientation(orientation);
+ }
value(): number {
return this.native.value();
}