diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-04-02 04:43:18 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-04-02 04:43:18 +0300 |
| commit | c845e800f0d4b17bc5ce65806fa5fadd9468c858 (patch) | |
| tree | a6bc48691aba3a2dd0e88aa18bc3a17a842bf76b /src/gui/widgets | |
| parent | bebb93a423a9f6bc7a2b7a610548da6ceaacee97 (diff) | |
| download | manaplus-c845e800f0d4b17bc5ce65806fa5fadd9468c858.tar.gz manaplus-c845e800f0d4b17bc5ce65806fa5fadd9468c858.tar.bz2 manaplus-c845e800f0d4b17bc5ce65806fa5fadd9468c858.tar.xz manaplus-c845e800f0d4b17bc5ce65806fa5fadd9468c858.zip | |
Change auto hide screen buttons to 3 states
(always show, hide in small window, always hide)
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/setupitem.cpp | 14 | ||||
| -rw-r--r-- | src/gui/widgets/setupitem.h | 6 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp index 93854e823..1cb007eae 100644 --- a/src/gui/widgets/setupitem.cpp +++ b/src/gui/widgets/setupitem.cpp @@ -712,7 +712,7 @@ SetupItemSlider2::SetupItemSlider2(std::string text, std::string description, std::string keyName, SetupTabScroll *parent, std::string eventName, int min, int max, SetupItemNames *values, bool onTheFly, - bool mainConfig) : + bool mainConfig, bool doNotAlign) : SetupItem(text, description, keyName, parent, eventName, mainConfig), mHorizont(nullptr), mLabel(nullptr), @@ -723,7 +723,8 @@ SetupItemSlider2::SetupItemSlider2(std::string text, std::string description, mMax(max), mInvert(false), mInvertValue(0), - mOnTheFly(onTheFly) + mOnTheFly(onTheFly), + mDoNotAlign(doNotAlign) { mValueType = VSTR; createControls(); @@ -733,7 +734,8 @@ SetupItemSlider2::SetupItemSlider2(std::string text, std::string description, std::string keyName, SetupTabScroll *parent, std::string eventName, int min, int max, SetupItemNames *values, std::string def, - bool onTheFly, bool mainConfig) : + bool onTheFly, bool mainConfig, + bool doNotAlign) : SetupItem(text, description, keyName, parent, eventName, def, mainConfig), mHorizont(nullptr), mLabel(nullptr), @@ -744,7 +746,8 @@ SetupItemSlider2::SetupItemSlider2(std::string text, std::string description, mMax(max), mInvert(false), mInvertValue(0), - mOnTheFly(onTheFly) + mOnTheFly(onTheFly), + mDoNotAlign(doNotAlign) { mValueType = VSTR; createControls(); @@ -777,7 +780,8 @@ void SetupItemSlider2::createControls() mWidget = mSlider; mSlider->setWidth(150); mSlider->setHeight(40); - fixFirstItemSize(mLabel); + if (!mDoNotAlign) + fixFirstItemSize(mLabel); mHorizont->add(mLabel); mHorizont->add(mSlider, -10); mHorizont->add(mLabel2); diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h index 86fdf95f9..52f8515c7 100644 --- a/src/gui/widgets/setupitem.h +++ b/src/gui/widgets/setupitem.h @@ -317,13 +317,14 @@ class SetupItemSlider2 : public SetupItem std::string keyName, SetupTabScroll *parent, std::string eventName, int min, int max, SetupItemNames *values, bool onTheFly = false, - bool mainConfig = true); + bool mainConfig = true, bool doNotAlign = false); SetupItemSlider2(std::string text, std::string description, std::string keyName, SetupTabScroll *parent, std::string eventName, int min, int max, SetupItemNames *values, std::string def, - bool onTheFly = false, bool mainConfig = true); + bool onTheFly = false, bool mainConfig = true, + bool doNotAlign = false); ~SetupItemSlider2(); @@ -354,6 +355,7 @@ class SetupItemSlider2 : public SetupItem bool mInvert; int mInvertValue; bool mOnTheFly; + bool mDoNotAlign; }; class SetupItemSliderList : public SetupItem |