From 79433a5c83264d9338f57445bf94d0673d017087 Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Sun, 7 Aug 2022 23:20:17 +0200 Subject: [PATCH] Add `horizontalScrollBar()` & `verticalScrollBar()` to `QAbstractScrollArea` --- .../qabstractscrollarea_macro.h | 19 ++++++++++++++++++- src/lib/QtWidgets/QAbstractScrollArea.ts | 16 +++++++++++----- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/cpp/include/nodegui/QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h b/src/cpp/include/nodegui/QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h index 9bb8a13e8..a109b60c1 100644 --- a/src/cpp/include/nodegui/QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h +++ b/src/cpp/include/nodegui/QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h @@ -60,6 +60,20 @@ QWidget* viewPort = this->instance->viewport(); \ auto instance = WrapperCache::instance.getWrapper(env, viewPort); \ return instance; \ + } \ + \ + Napi::Value horizontalScrollBar(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + QScrollBar* scrollBar = this->instance->horizontalScrollBar(); \ + auto instance = WrapperCache::instance.getWrapper(env, scrollBar); \ + return instance; \ + } \ + \ + Napi::Value verticalScrollBar(const Napi::CallbackInfo& info) { \ + Napi::Env env = info.Env(); \ + QScrollBar* scrollBar = this->instance->verticalScrollBar(); \ + auto instance = WrapperCache::instance.getWrapper(env, scrollBar); \ + return instance; \ } #endif // QABSTRACTSCROLLAREA_WRAPPED_METHODS_DECLARATION @@ -75,7 +89,10 @@ InstanceMethod("setVerticalScrollBar", \ &WidgetWrapName::setVerticalScrollBar), \ InstanceMethod("setViewport", &WidgetWrapName::setViewport), \ - InstanceMethod("viewport", &WidgetWrapName::viewport), + InstanceMethod("viewport", &WidgetWrapName::viewport), \ + InstanceMethod("horizontalScrollBar", \ + &WidgetWrapName::horizontalScrollBar), \ + InstanceMethod("verticalScrollBar", &WidgetWrapName::verticalScrollBar), #endif // QABSTRACTSCROLLAREA_WRAPPED_METHODS_EXPORT_DEFINE diff --git a/src/lib/QtWidgets/QAbstractScrollArea.ts b/src/lib/QtWidgets/QAbstractScrollArea.ts index 5e786404b..1468f7ee0 100644 --- a/src/lib/QtWidgets/QAbstractScrollArea.ts +++ b/src/lib/QtWidgets/QAbstractScrollArea.ts @@ -19,11 +19,8 @@ QAbstractScrollArea will list all methods and properties that are common to all */ export abstract class QAbstractScrollArea extends QFrame { - setViewport(widget: QWidget): void { - this.native.setViewport(widget.native); - } - viewport(): QWidget { - return wrapperCache.getWrapper(this.native.viewport()) as QWidget; + horizontalScrollBar(): QScrollBar { + return wrapperCache.getWrapper(this.native.horizontalScrollBar()) as QScrollBar; } maximumViewportSize(): QSize { return this.native.maximumViewportSize(); @@ -34,12 +31,21 @@ export abstract class QAbstractScrollArea