diff options
author | falkTX <falktx@gmail.com> | 2015-05-05 00:47:21 +0200 |
---|---|---|
committer | falkTX <falktx@gmail.com> | 2015-05-05 00:47:21 +0200 |
commit | 90898bce5f76a2abe13f0cd352ae9655ef8a8d0c (patch) | |
tree | b4e4f12654aa3c2f622885392392aa34dc8010de | |
parent | 9ef573d693a8d4e515f389529b7144f9430b9062 (diff) |
Remove some internal functions
-rw-r--r-- | dgl/ImageSlider.hpp | 1 | ||||
-rw-r--r-- | dgl/NanoVG.hpp | 6 | ||||
-rw-r--r-- | dgl/StandaloneWindow.hpp | 4 | ||||
-rw-r--r-- | dgl/Widget.hpp | 17 | ||||
-rw-r--r-- | dgl/src/ImageSlider.cpp | 6 | ||||
-rw-r--r-- | dgl/src/Widget.cpp | 10 | ||||
-rw-r--r-- | distrho/DistrhoUI.hpp | 1 | ||||
-rw-r--r-- | distrho/src/DistrhoUI.cpp | 2 |
8 files changed, 10 insertions, 37 deletions
diff --git a/dgl/ImageSlider.hpp b/dgl/ImageSlider.hpp index ce757992..236714e7 100644 --- a/dgl/ImageSlider.hpp +++ b/dgl/ImageSlider.hpp @@ -86,7 +86,6 @@ private: void setAbsoluteY(int) const noexcept {} void setAbsolutePos(int, int) const noexcept {} void setAbsolutePos(const Point<int>&) const noexcept {} - void setNeedsFullViewport(bool) const noexcept {} DISTRHO_LEAK_DETECTOR(ImageSlider) }; diff --git a/dgl/NanoVG.hpp b/dgl/NanoVG.hpp index e16396a5..4948daaa 100644 --- a/dgl/NanoVG.hpp +++ b/dgl/NanoVG.hpp @@ -871,7 +871,7 @@ public: NanoVG(flags), leakDetector_NanoWidget() { - setNeedsScaling(true); + fNeedsScaling = true; } /** @@ -882,7 +882,7 @@ public: NanoVG(flags), leakDetector_NanoWidget() { - setNeedsScaling(true); + fNeedsScaling = true; } /** @@ -893,7 +893,7 @@ public: NanoVG(groupWidget), leakDetector_NanoWidget() { - setNeedsScaling(true); + fNeedsScaling = true; groupWidget->fNanoSubWidgets.push_back(this); } diff --git a/dgl/StandaloneWindow.hpp b/dgl/StandaloneWindow.hpp index d23ec870..5cb4217c 100644 --- a/dgl/StandaloneWindow.hpp +++ b/dgl/StandaloneWindow.hpp @@ -56,7 +56,7 @@ private: if (fWidget == nullptr) { fWidget = widget; - fWidget->setNeedsFullViewport(true); + fWidget->fNeedsFullViewport = true; } Window::_addWidget(widget); } @@ -65,7 +65,7 @@ private: { if (fWidget == widget) { - fWidget->setNeedsFullViewport(false); + fWidget->fNeedsFullViewport = false; fWidget = nullptr; } Window::_removeWidget(widget); diff --git a/dgl/Widget.hpp b/dgl/Widget.hpp index a6e2e641..d6d258d2 100644 --- a/dgl/Widget.hpp +++ b/dgl/Widget.hpp @@ -357,22 +357,6 @@ protected: */ 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: Window& fParent; bool fNeedsFullViewport; @@ -390,6 +374,7 @@ private: /** @internal */ void _displaySubWidgets(); + friend class ImageSlider; friend class NanoWidget; friend class Window; friend class StandaloneWindow; diff --git a/dgl/src/ImageSlider.cpp b/dgl/src/ImageSlider.cpp index 1f32341d..00f654e0 100644 --- a/dgl/src/ImageSlider.cpp +++ b/dgl/src/ImageSlider.cpp @@ -40,7 +40,7 @@ ImageSlider::ImageSlider(Window& parent, const Image& image) noexcept fSliderArea(), leakDetector_ImageSlider() { - Widget::setNeedsFullViewport(true); + fNeedsFullViewport = true; } ImageSlider::ImageSlider(Widget* widget, const Image& image) noexcept @@ -61,7 +61,7 @@ ImageSlider::ImageSlider(Widget* widget, const Image& image) noexcept fSliderArea(), leakDetector_ImageSlider() { - Widget::setNeedsFullViewport(true); + fNeedsFullViewport = true; } ImageSlider::ImageSlider(const ImageSlider& imageSlider) noexcept @@ -82,7 +82,7 @@ ImageSlider::ImageSlider(const ImageSlider& imageSlider) noexcept fSliderArea(imageSlider.fSliderArea), leakDetector_ImageSlider() { - Widget::setNeedsFullViewport(true); + fNeedsFullViewport = true; } ImageSlider& ImageSlider::operator=(const ImageSlider& imageSlider) noexcept diff --git a/dgl/src/Widget.cpp b/dgl/src/Widget.cpp index ba44695c..62a1aca4 100644 --- a/dgl/src/Widget.cpp +++ b/dgl/src/Widget.cpp @@ -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() { for (std::vector<Widget*>::iterator it = fSubWidgets.begin(); it != fSubWidgets.end(); ++it) diff --git a/distrho/DistrhoUI.hpp b/distrho/DistrhoUI.hpp index 8ab6626f..18d07892 100644 --- a/distrho/DistrhoUI.hpp +++ b/distrho/DistrhoUI.hpp @@ -181,7 +181,6 @@ private: void setAbsoluteY(int) const noexcept {} void setAbsolutePos(int, int) const noexcept {} void setAbsolutePos(const DGL::Point<int>&) const noexcept {} - void setNeedsFullViewport(bool) const noexcept {} DISTRHO_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(UI) }; diff --git a/distrho/src/DistrhoUI.cpp b/distrho/src/DistrhoUI.cpp index 5e69b123..9e091e40 100644 --- a/distrho/src/DistrhoUI.cpp +++ b/distrho/src/DistrhoUI.cpp @@ -32,7 +32,7 @@ UI::UI(uint width, uint height) : UIWidget(*d_lastUiWindow), pData(new PrivateData()) { - UIWidget::setNeedsFullViewport(true); + fNeedsFullViewport = true; if (width > 0 && height > 0) setSize(width, height); |