noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

reordered settings

Browse source
This commit is contained in:
fourtf 2020-08-13 18:19:39 +02:00
parent adbe92bd60
commit fcba8c8a17
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/widgets/settingspages/GeneralPage.cpp
View file

@ -348,11 +348,8 @@ void GeneralPage::initLayout(SettingsLayout &layout)
return QString::number(val) + "x"; return QString::number(val) + "x";
}, },
[](auto args) { return fuzzyToFloat(args.value, 1.f); }); [](auto args) { return fuzzyToFloat(args.value, 1.f); });
layout.addCheckbox("Smooth scrolling", s.enableSmoothScrolling);
layout.addCheckbox("Smooth scrolling on new messages",
s.enableSmoothScrollingNewMessages);
layout.addDropdown<float>( layout.addDropdown<float>(
"Pause after hover", "Pause on mouse hover",
{"Disabled", "0.5s", "1s", "2s", "5s", "Indefinite"}, {"Disabled", "0.5s", "1s", "2s", "5s", "Indefinite"},
s.pauseOnHoverDuration, s.pauseOnHoverDuration,
[](auto val) { [](auto val) {
@ -374,6 +371,9 @@ void GeneralPage::initLayout(SettingsLayout &layout)
}); });
addKeyboardModifierSetting(layout, "Pause while holding a key", addKeyboardModifierSetting(layout, "Pause while holding a key",
s.pauseChatModifier); s.pauseChatModifier);
layout.addCheckbox("Smooth scrolling", s.enableSmoothScrolling);
layout.addCheckbox("Smooth scrolling on new messages",
s.enableSmoothScrollingNewMessages);
layout.addCheckbox("Show input when it's empty", s.showEmptyInput); layout.addCheckbox("Show input when it's empty", s.showEmptyInput);
layout.addCheckbox("Show message length while typing", s.showMessageLength); layout.addCheckbox("Show message length while typing", s.showMessageLength);
@ -411,10 +411,6 @@ void GeneralPage::initLayout(SettingsLayout &layout)
: QString("Never"); : QString("Never");
}, },
[](auto args) { return fuzzyToInt(args.value, 0); }); [](auto args) { return fuzzyToInt(args.value, 0); });
layout.addDropdown<int>(
"Stack timeouts", {"Stack", "Stack until timeout", "Don't stack"},
s.timeoutStackStyle, [](int index) { return index; },
[](auto args) { return args.index; }, false);
layout.addTitle("Emotes"); layout.addTitle("Emotes");
layout.addCheckbox("Enable", s.enableEmoteImages); layout.addCheckbox("Enable", s.enableEmoteImages);
@ -663,8 +659,11 @@ void GeneralPage::initLayout(SettingsLayout &layout)
layout.addCheckbox( layout.addCheckbox(
"Hide viewercount and stream length while hovering the split", "Hide viewercount and stream length while hovering the split",
s.hideViewerCountAndDuration); s.hideViewerCountAndDuration);
layout.addCheckbox( layout.addDropdown<int>(
"Ask for confirmation when uploading an image to i.nuuls.com", "Stack timeouts", {"Stack", "Stack until timeout", "Don't stack"},
s.timeoutStackStyle, [](int index) { return index; },
[](auto args) { return args.index; }, false);
layout.addCheckbox("Ask for confirmation when uploading an image",
s.askOnImageUpload); s.askOnImageUpload);
// invisible element for width // invisible element for width