kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Option to hide folder names

Browse source
This commit is contained in:
Eric Kotato 2020-03-30 09:38:52 +03:00
parent efe2dad856
commit d6eb5aedc2
7 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Telegram/SourceFiles/core/kotato_settings.cpp
View file

@ -346,6 +346,10 @@ bool Manager::readCustomFile() {
ReadBoolOption(o, "hide_edit_button", [&](auto v) { ReadBoolOption(o, "hide_edit_button", [&](auto v) {
cSetHideFilterEditButton(v); cSetHideFilterEditButton(v);
}); });
ReadBoolOption(o, "hide_names", [&](auto v) {
cSetHideFilterNames(v);
});
}); });
return true; return true;
} }
@ -396,6 +400,7 @@ void Manager::writeDefaultFile() {
settingsFolders.insert(qsl("default"), cDefaultFilterId()); settingsFolders.insert(qsl("default"), cDefaultFilterId());
settingsFolders.insert(qsl("count_unmuted_only"), cUnmutedFilterCounterOnly()); settingsFolders.insert(qsl("count_unmuted_only"), cUnmutedFilterCounterOnly());
settingsFolders.insert(qsl("hide_edit_button"), cHideFilterEditButton()); settingsFolders.insert(qsl("hide_edit_button"), cHideFilterEditButton());
settingsFolders.insert(qsl("hide_names"), cHideFilterNames());
settings.insert(qsl("folders"), settingsFolders); settings.insert(qsl("folders"), settingsFolders);
@ -468,6 +473,7 @@ void Manager::writeCurrentSettings() {
settingsFolders.insert(qsl("default"), cDefaultFilterId()); settingsFolders.insert(qsl("default"), cDefaultFilterId());
settingsFolders.insert(qsl("count_unmuted_only"), cUnmutedFilterCounterOnly()); settingsFolders.insert(qsl("count_unmuted_only"), cUnmutedFilterCounterOnly());
settingsFolders.insert(qsl("hide_edit_button"), cHideFilterEditButton()); settingsFolders.insert(qsl("hide_edit_button"), cHideFilterEditButton());
settingsFolders.insert(qsl("hide_names"), cHideFilterNames());
settings.insert(qsl("folders"), settingsFolders); settings.insert(qsl("folders"), settingsFolders);

1
Telegram/SourceFiles/settings.cpp
View file

@ -323,3 +323,4 @@ int gCustomAppIcon = 0;
int gDefaultFilterId = 0; int gDefaultFilterId = 0;
bool gUnmutedFilterCounterOnly = false; bool gUnmutedFilterCounterOnly = false;
bool gHideFilterEditButton = false; bool gHideFilterEditButton = false;
bool gHideFilterNames = false;

1
Telegram/SourceFiles/settings.h
View file

@ -253,3 +253,4 @@ DeclareSetting(int, CustomAppIcon);
DeclareSetting(int, DefaultFilterId); DeclareSetting(int, DefaultFilterId);
DeclareSetting(bool, UnmutedFilterCounterOnly); DeclareSetting(bool, UnmutedFilterCounterOnly);
DeclareSetting(bool, HideFilterEditButton); DeclareSetting(bool, HideFilterEditButton);
DeclareSetting(bool, HideFilterNames);

3
Telegram/SourceFiles/window/window.style
View file

@ -251,10 +251,11 @@ createThemeLink: InputField(defaultInputField) {
} }
windowFiltersWidth: 72px; windowFiltersWidth: 72px;
windowFiltersWidthNoText: 50px;
windowFiltersButton: SideBarButton(defaultSideBarButton) { windowFiltersButton: SideBarButton(defaultSideBarButton) {
textTop: 40px; textTop: 40px;
textSkip: 6px; textSkip: 6px;
minHeight: 62px; minHeight: 48px;
minTextWidth: 48px; minTextWidth: 48px;
style: TextStyle(defaultTextStyle) { style: TextStyle(defaultTextStyle) {
font: font(11px semibold); font: font(11px semibold);

4
Telegram/SourceFiles/window/window_filters_menu.cpp
View file

@ -89,7 +89,7 @@ void FiltersMenu::setup() {
_parent->heightValue( _parent->heightValue(
) | rpl::start_with_next([=](int height) { ) | 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 }); _outer.setGeometry({ 0, 0, width, height });
_menu.resizeToWidth(width); _menu.resizeToWidth(width);
_menu.move(0, 0); _menu.move(0, 0);
@ -203,7 +203,7 @@ base::unique_qptr<Ui::SideBarButton> FiltersMenu::prepareButton(
auto button = base::unique_qptr<Ui::SideBarButton>(container->add( auto button = base::unique_qptr<Ui::SideBarButton>(container->add(
object_ptr<Ui::SideBarButton>( object_ptr<Ui::SideBarButton>(
container, container,
title, (cHideFilterNames() ? QString() : title),
st::windowFiltersButton))); st::windowFiltersButton)));
const auto raw = button.get(); const auto raw = button.get();
const auto &icons = Ui::LookupFilterIcon(icon); const auto &icons = Ui::LookupFilterIcon(icon);

2
Telegram/SourceFiles/window/window_session_controller.cpp
View file

@ -775,7 +775,7 @@ rpl::producer<FullMsgId> SessionController::floatPlayerClosed() const {
} }
int SessionController::filtersWidth() const { int SessionController::filtersWidth() const {
return _filters ? st::windowFiltersWidth : 0; return _filters ? (cHideFilterNames() ? st::windowFiltersWidthNoText : st::windowFiltersWidth) : 0;
} }
rpl::producer<FilterId> SessionController::activeChatsFilter() const { rpl::producer<FilterId> SessionController::activeChatsFilter() const {

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit 659d46b6931eee0f11a2f2c281805771834145d0 Subproject commit da67e47aa2c40f4dc45df540c4e96d481bede0cc