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

Make Tab Layout setting only accept predefined values (#3564)

Browse source 
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
This commit is contained in:
Mm2PL 2022-02-12 12:27:25 +00:00 committed by GitHub
parent 092f66dc15
commit b2fa7b1d94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -53,6 +53,7 @@
- Minor: Removed timestamp from AutoMod messages. (#3503) - Minor: Removed timestamp from AutoMod messages. (#3503)
- Minor: Added ability to copy message ID with `Shift + Right Click`. (#3481) - Minor: Added ability to copy message ID with `Shift + Right Click`. (#3481)
- Minor: Colorize the entire split header when focused. (#3379) - Minor: Colorize the entire split header when focused. (#3379)
- Minor: Make Tab Layout setting only accept predefined values (#3564)
- Bugfix: Fix Split Input hotkeys not being available when input is hidden (#3362) - Bugfix: Fix Split Input hotkeys not being available when input is hidden (#3362)
- Bugfix: Fixed colored usernames sometimes not working. (#3170) - Bugfix: Fixed colored usernames sometimes not working. (#3170)
- Bugfix: Restored ability to send duplicate `/me` messages. (#3166) - Bugfix: Restored ability to send duplicate `/me` messages. (#3166)

4
src/singletons/Settings.hpp
View file

@ -98,8 +98,8 @@ public:
"/appearance/messages/usernameDisplayMode", "/appearance/messages/usernameDisplayMode",
UsernameDisplayMode::UsernameAndLocalizedName}; UsernameDisplayMode::UsernameAndLocalizedName};
IntSetting tabDirection = {"/appearance/tabDirection", EnumSetting<NotebookTabDirection> tabDirection = {
NotebookTabDirection::Horizontal}; "/appearance/tabDirection", NotebookTabDirection::Horizontal};
// BoolSetting collapseLongMessages = // BoolSetting collapseLongMessages =
// {"/appearance/messages/collapseLongMessages", false}; // {"/appearance/messages/collapseLongMessages", false};

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

@ -144,7 +144,8 @@ void GeneralPage::initLayout(GeneralPageView &layout)
[](auto args) { [](auto args) {
return fuzzyToFloat(args.value, 1.f); return fuzzyToFloat(args.value, 1.f);
}); });
layout.addDropdown<int>( ComboBox *tabDirectionDropdown =
layout.addDropdown<std::underlying_type<NotebookTabDirection>::type>(
"Tab layout", {"Horizontal", "Vertical"}, s.tabDirection, "Tab layout", {"Horizontal", "Vertical"}, s.tabDirection,
[](auto val) { [](auto val) {
switch (val) switch (val)
@ -167,7 +168,10 @@ void GeneralPage::initLayout(GeneralPageView &layout)
// default to horizontal // default to horizontal
return NotebookTabDirection::Horizontal; return NotebookTabDirection::Horizontal;
} }
}); },
false);
tabDirectionDropdown->setMinimumWidth(
tabDirectionDropdown->minimumSizeHint().width());
layout.addCheckbox("Show tab close button", s.showTabCloseButton); layout.addCheckbox("Show tab close button", s.showTabCloseButton);
layout.addCheckbox("Always on top", s.windowTopMost); layout.addCheckbox("Always on top", s.windowTopMost);