vlc | branch: master | Prince Gupta <guptaprince8...@gmail.com> | Tue Feb 23 15:53:57 2021 +0530| [6dc459cb27ffaa70d990c92743638eef1ab56b64] | committer: Pierre Lamot
qt: add functions to change user scale factor in maininterface Signed-off-by: Pierre Lamot <pie...@videolabs.io> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6dc459cb27ffaa70d990c92743638eef1ab56b64 --- modules/gui/qt/maininterface/main_interface.cpp | 9 +++++++-- modules/gui/qt/maininterface/main_interface.hpp | 6 ++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/modules/gui/qt/maininterface/main_interface.cpp b/modules/gui/qt/maininterface/main_interface.cpp index 8a45c785af..3a0af1fe63 100644 --- a/modules/gui/qt/maininterface/main_interface.cpp +++ b/modules/gui/qt/maininterface/main_interface.cpp @@ -357,9 +357,14 @@ void MainInterface::updateIntfScaleFactor() void MainInterface::incrementIntfUserScaleFactor(bool increment) { if (increment) - m_intfUserScaleFactor = std::min(m_intfUserScaleFactor + 0.1, 3.0); + setIntfUserScaleFactor(m_intfScaleFactor + .1f); else - m_intfUserScaleFactor = std::max(m_intfUserScaleFactor - 0.1, 0.3); + setIntfUserScaleFactor(m_intfScaleFactor - .1f); +} + +void MainInterface::setIntfUserScaleFactor(float newValue) +{ + m_intfUserScaleFactor = std::max(std::min(newValue, getMaxIntfUserScaleFactor()), getMinIntfUserScaleFactor()); updateIntfScaleFactor(); } diff --git a/modules/gui/qt/maininterface/main_interface.hpp b/modules/gui/qt/maininterface/main_interface.hpp index 5b480c7944..3672ce000c 100644 --- a/modules/gui/qt/maininterface/main_interface.hpp +++ b/modules/gui/qt/maininterface/main_interface.hpp @@ -165,6 +165,8 @@ public: virtual ~MainInterface(); static const QEvent::Type ToolbarsNeedRebuild; + static constexpr float MIN_INTF_USER_SCALE_FACTOR = .3f; + static constexpr float MAX_INTF_USER_SCALE_FACTOR = 3.f; public: /* Getters */ @@ -191,6 +193,9 @@ public: inline bool isHideAfterCreation() const { return b_hideAfterCreation; } inline bool isShowRemainingTime() const { return m_showRemainingTime; } inline float getIntfScaleFactor() const { return m_intfScaleFactor; } + inline float getIntfUserScaleFactor() const { return m_intfUserScaleFactor; } + inline float getMinIntfUserScaleFactor() const { return MIN_INTF_USER_SCALE_FACTOR; } + inline float getMaxIntfUserScaleFactor() const { return MAX_INTF_USER_SCALE_FACTOR; } inline bool hasMediaLibrary() const { return b_hasMedialibrary; } inline MediaLib* getMediaLibrary() const { return m_medialib; } inline bool hasGridView() const { return m_gridView; } @@ -294,6 +299,7 @@ public slots: void setShowRemainingTime( bool ); void setGridView( bool ); void incrementIntfUserScaleFactor( bool increment); + void setIntfUserScaleFactor( float ); void emitBoss(); void emitRaise(); _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
