diff --git a/Telegram/SourceFiles/core/kotato_settings.cpp b/Telegram/SourceFiles/core/kotato_settings.cpp index 38225cd3a..4d2a55083 100644 --- a/Telegram/SourceFiles/core/kotato_settings.cpp +++ b/Telegram/SourceFiles/core/kotato_settings.cpp @@ -346,6 +346,10 @@ bool Manager::readCustomFile() { ReadBoolOption(o, "hide_edit_button", [&](auto v) { cSetHideFilterEditButton(v); }); + + ReadBoolOption(o, "hide_names", [&](auto v) { + cSetHideFilterNames(v); + }); }); return true; } @@ -396,6 +400,7 @@ void Manager::writeDefaultFile() { settingsFolders.insert(qsl("default"), cDefaultFilterId()); settingsFolders.insert(qsl("count_unmuted_only"), cUnmutedFilterCounterOnly()); settingsFolders.insert(qsl("hide_edit_button"), cHideFilterEditButton()); + settingsFolders.insert(qsl("hide_names"), cHideFilterNames()); settings.insert(qsl("folders"), settingsFolders); @@ -468,6 +473,7 @@ void Manager::writeCurrentSettings() { settingsFolders.insert(qsl("default"), cDefaultFilterId()); settingsFolders.insert(qsl("count_unmuted_only"), cUnmutedFilterCounterOnly()); settingsFolders.insert(qsl("hide_edit_button"), cHideFilterEditButton()); + settingsFolders.insert(qsl("hide_names"), cHideFilterNames()); settings.insert(qsl("folders"), settingsFolders); diff --git a/Telegram/SourceFiles/settings.cpp b/Telegram/SourceFiles/settings.cpp index 74fcaf1de..cd3c433e0 100644 --- a/Telegram/SourceFiles/settings.cpp +++ b/Telegram/SourceFiles/settings.cpp @@ -323,3 +323,4 @@ int gCustomAppIcon = 0; int gDefaultFilterId = 0; bool gUnmutedFilterCounterOnly = false; bool gHideFilterEditButton = false; +bool gHideFilterNames = false; diff --git a/Telegram/SourceFiles/settings.h b/Telegram/SourceFiles/settings.h index e959c4790..0f8caa183 100644 --- a/Telegram/SourceFiles/settings.h +++ b/Telegram/SourceFiles/settings.h @@ -253,3 +253,4 @@ DeclareSetting(int, CustomAppIcon); DeclareSetting(int, DefaultFilterId); DeclareSetting(bool, UnmutedFilterCounterOnly); DeclareSetting(bool, HideFilterEditButton); +DeclareSetting(bool, HideFilterNames); diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style index d6f0b0425..e2a4c5918 100644 --- a/Telegram/SourceFiles/window/window.style +++ b/Telegram/SourceFiles/window/window.style @@ -251,10 +251,11 @@ createThemeLink: InputField(defaultInputField) { } windowFiltersWidth: 72px; +windowFiltersWidthNoText: 50px; windowFiltersButton: SideBarButton(defaultSideBarButton) { textTop: 40px; textSkip: 6px; - minHeight: 62px; + minHeight: 48px; minTextWidth: 48px; style: TextStyle(defaultTextStyle) { font: font(11px semibold); diff --git a/Telegram/SourceFiles/window/window_filters_menu.cpp b/Telegram/SourceFiles/window/window_filters_menu.cpp index bffeef3d0..06693879b 100644 --- a/Telegram/SourceFiles/window/window_filters_menu.cpp +++ b/Telegram/SourceFiles/window/window_filters_menu.cpp @@ -89,7 +89,7 @@ void FiltersMenu::setup() { _parent->heightValue( ) | rpl::start_with_next([=](int height) { - const auto width = st::windowFiltersWidth; + const auto width = (cHideFilterNames() ? st::windowFiltersWidthNoText : st::windowFiltersWidth); _outer.setGeometry({ 0, 0, width, height }); _menu.resizeToWidth(width); _menu.move(0, 0); @@ -203,7 +203,7 @@ base::unique_qptr FiltersMenu::prepareButton( auto button = base::unique_qptr(container->add( object_ptr( container, - title, + (cHideFilterNames() ? QString() : title), st::windowFiltersButton))); const auto raw = button.get(); const auto &icons = Ui::LookupFilterIcon(icon); diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp index fec29732a..ed4211632 100644 --- a/Telegram/SourceFiles/window/window_session_controller.cpp +++ b/Telegram/SourceFiles/window/window_session_controller.cpp @@ -775,7 +775,7 @@ rpl::producer SessionController::floatPlayerClosed() const { } int SessionController::filtersWidth() const { - return _filters ? st::windowFiltersWidth : 0; + return _filters ? (cHideFilterNames() ? st::windowFiltersWidthNoText : st::windowFiltersWidth) : 0; } rpl::producer SessionController::activeChatsFilter() const { diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 659d46b69..da67e47aa 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 659d46b6931eee0f11a2f2c281805771834145d0 +Subproject commit da67e47aa2c40f4dc45df540c4e96d481bede0cc