| @@ -86,7 +86,6 @@ private: | |||||
| void setAbsoluteY(int) const noexcept {} | void setAbsoluteY(int) const noexcept {} | ||||
| void setAbsolutePos(int, int) const noexcept {} | void setAbsolutePos(int, int) const noexcept {} | ||||
| void setAbsolutePos(const Point<int>&) const noexcept {} | void setAbsolutePos(const Point<int>&) const noexcept {} | ||||
| void setNeedsFullViewport(bool) const noexcept {} | |||||
| DISTRHO_LEAK_DETECTOR(ImageSlider) | DISTRHO_LEAK_DETECTOR(ImageSlider) | ||||
| }; | }; | ||||
| @@ -871,7 +871,7 @@ public: | |||||
| NanoVG(flags), | NanoVG(flags), | ||||
| leakDetector_NanoWidget() | leakDetector_NanoWidget() | ||||
| { | { | ||||
| setNeedsScaling(true); | |||||
| fNeedsScaling = true; | |||||
| } | } | ||||
| /** | /** | ||||
| @@ -882,7 +882,7 @@ public: | |||||
| NanoVG(flags), | NanoVG(flags), | ||||
| leakDetector_NanoWidget() | leakDetector_NanoWidget() | ||||
| { | { | ||||
| setNeedsScaling(true); | |||||
| fNeedsScaling = true; | |||||
| } | } | ||||
| /** | /** | ||||
| @@ -893,7 +893,7 @@ public: | |||||
| NanoVG(groupWidget), | NanoVG(groupWidget), | ||||
| leakDetector_NanoWidget() | leakDetector_NanoWidget() | ||||
| { | { | ||||
| setNeedsScaling(true); | |||||
| fNeedsScaling = true; | |||||
| groupWidget->fNanoSubWidgets.push_back(this); | groupWidget->fNanoSubWidgets.push_back(this); | ||||
| } | } | ||||
| @@ -56,7 +56,7 @@ private: | |||||
| if (fWidget == nullptr) | if (fWidget == nullptr) | ||||
| { | { | ||||
| fWidget = widget; | fWidget = widget; | ||||
| fWidget->setNeedsFullViewport(true); | |||||
| fWidget->fNeedsFullViewport = true; | |||||
| } | } | ||||
| Window::_addWidget(widget); | Window::_addWidget(widget); | ||||
| } | } | ||||
| @@ -65,7 +65,7 @@ private: | |||||
| { | { | ||||
| if (fWidget == widget) | if (fWidget == widget) | ||||
| { | { | ||||
| fWidget->setNeedsFullViewport(false); | |||||
| fWidget->fNeedsFullViewport = false; | |||||
| fWidget = nullptr; | fWidget = nullptr; | ||||
| } | } | ||||
| Window::_removeWidget(widget); | Window::_removeWidget(widget); | ||||
| @@ -357,22 +357,6 @@ protected: | |||||
| */ | */ | ||||
| virtual void onResize(const ResizeEvent&); | virtual void onResize(const ResizeEvent&); | ||||
| /** | |||||
| Tell the parent window this widget needs the full viewport. | |||||
| When enabled, the local widget coordinates are ignored. | |||||
| @note This is an internal function; | |||||
| You do not need it under normal circumstances. | |||||
| */ | |||||
| void setNeedsFullViewport(bool yesNo) noexcept; | |||||
| /** | |||||
| Tell the parent window this widget needs scaling. | |||||
| When enabled, the widget viewport is scaled to match width and height. | |||||
| @note This is an internal function; | |||||
| You do not need it under normal circumstances. | |||||
| */ | |||||
| void setNeedsScaling(bool yesNo) noexcept; | |||||
| private: | private: | ||||
| Window& fParent; | Window& fParent; | ||||
| bool fNeedsFullViewport; | bool fNeedsFullViewport; | ||||
| @@ -390,6 +374,7 @@ private: | |||||
| /** @internal */ | /** @internal */ | ||||
| void _displaySubWidgets(); | void _displaySubWidgets(); | ||||
| friend class ImageSlider; | |||||
| friend class NanoWidget; | friend class NanoWidget; | ||||
| friend class Window; | friend class Window; | ||||
| friend class StandaloneWindow; | friend class StandaloneWindow; | ||||
| @@ -40,7 +40,7 @@ ImageSlider::ImageSlider(Window& parent, const Image& image) noexcept | |||||
| fSliderArea(), | fSliderArea(), | ||||
| leakDetector_ImageSlider() | leakDetector_ImageSlider() | ||||
| { | { | ||||
| Widget::setNeedsFullViewport(true); | |||||
| fNeedsFullViewport = true; | |||||
| } | } | ||||
| ImageSlider::ImageSlider(Widget* widget, const Image& image) noexcept | ImageSlider::ImageSlider(Widget* widget, const Image& image) noexcept | ||||
| @@ -61,7 +61,7 @@ ImageSlider::ImageSlider(Widget* widget, const Image& image) noexcept | |||||
| fSliderArea(), | fSliderArea(), | ||||
| leakDetector_ImageSlider() | leakDetector_ImageSlider() | ||||
| { | { | ||||
| Widget::setNeedsFullViewport(true); | |||||
| fNeedsFullViewport = true; | |||||
| } | } | ||||
| ImageSlider::ImageSlider(const ImageSlider& imageSlider) noexcept | ImageSlider::ImageSlider(const ImageSlider& imageSlider) noexcept | ||||
| @@ -82,7 +82,7 @@ ImageSlider::ImageSlider(const ImageSlider& imageSlider) noexcept | |||||
| fSliderArea(imageSlider.fSliderArea), | fSliderArea(imageSlider.fSliderArea), | ||||
| leakDetector_ImageSlider() | leakDetector_ImageSlider() | ||||
| { | { | ||||
| Widget::setNeedsFullViewport(true); | |||||
| fNeedsFullViewport = true; | |||||
| } | } | ||||
| ImageSlider& ImageSlider::operator=(const ImageSlider& imageSlider) noexcept | ImageSlider& ImageSlider::operator=(const ImageSlider& imageSlider) noexcept | ||||
| @@ -274,16 +274,6 @@ void Widget::onResize(const ResizeEvent&) | |||||
| { | { | ||||
| } | } | ||||
| void Widget::setNeedsFullViewport(bool yesNo) noexcept | |||||
| { | |||||
| fNeedsFullViewport = yesNo; | |||||
| } | |||||
| void Widget::setNeedsScaling(bool yesNo) noexcept | |||||
| { | |||||
| fNeedsScaling = yesNo; | |||||
| } | |||||
| void Widget::_displaySubWidgets() | void Widget::_displaySubWidgets() | ||||
| { | { | ||||
| for (std::vector<Widget*>::iterator it = fSubWidgets.begin(); it != fSubWidgets.end(); ++it) | for (std::vector<Widget*>::iterator it = fSubWidgets.begin(); it != fSubWidgets.end(); ++it) | ||||
| @@ -181,7 +181,6 @@ private: | |||||
| void setAbsoluteY(int) const noexcept {} | void setAbsoluteY(int) const noexcept {} | ||||
| void setAbsolutePos(int, int) const noexcept {} | void setAbsolutePos(int, int) const noexcept {} | ||||
| void setAbsolutePos(const DGL::Point<int>&) const noexcept {} | void setAbsolutePos(const DGL::Point<int>&) const noexcept {} | ||||
| void setNeedsFullViewport(bool) const noexcept {} | |||||
| DISTRHO_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(UI) | DISTRHO_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(UI) | ||||
| }; | }; | ||||
| @@ -32,7 +32,7 @@ UI::UI(uint width, uint height) | |||||
| : UIWidget(*d_lastUiWindow), | : UIWidget(*d_lastUiWindow), | ||||
| pData(new PrivateData()) | pData(new PrivateData()) | ||||
| { | { | ||||
| UIWidget::setNeedsFullViewport(true); | |||||
| fNeedsFullViewport = true; | |||||
| if (width > 0 && height > 0) | if (width > 0 && height > 0) | ||||
| setSize(width, height); | setSize(width, height); | ||||