From 45ce0ecb1fc4bbe8c9fce86c5542465ab1f740d3 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 9 Nov 2016 11:35:41 +0300 Subject: [PATCH] Dialogs filter input field without search icon. --- Telegram/Resources/basic.style | 2 +- Telegram/SourceFiles/dialogs/dialogs.style | 3 +-- Telegram/SourceFiles/overview/overview.style | 13 +++++++++++++ Telegram/SourceFiles/overviewwidget.cpp | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Telegram/Resources/basic.style b/Telegram/Resources/basic.style index 7957db994a..e06e944edf 100644 --- a/Telegram/Resources/basic.style +++ b/Telegram/Resources/basic.style @@ -279,7 +279,7 @@ shadowToggleDuration: 200; slideDuration: 240; slideShift: 100px; slideFadeOutBg: #0000003c; -slideShadow: icon {{ "slide_shadow", #000000 }}; +slideShadow: icon {{ "slide_shadow", windowShadowFg }}; btnYesColor: #0080c0; btnYesHover: #0073ad; diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style index bc36e866d0..a50ba0084e 100644 --- a/Telegram/SourceFiles/dialogs/dialogs.style +++ b/Telegram/SourceFiles/dialogs/dialogs.style @@ -97,11 +97,10 @@ dialogsFilter: flatInput(inpDefGray) { bgColor: #f2f2f2; phColor: #949494; phFocusColor: #a4a4a4; - icon: fieldSearchIcon; width: 240px; height: 32px; - textMrg: margins(32px, 3px, 32px, 3px); + textMrg: margins(12px, 3px, 12px, 3px); } dialogsCancelSearch: IconButton(dialogsMenuToggle) { icon: icon {{ "dialogs_cancel_search", dialogsMenuIconFg, point(0px, 1px) }}; diff --git a/Telegram/SourceFiles/overview/overview.style b/Telegram/SourceFiles/overview/overview.style index 3c5ef86385..a9fb2ac68b 100644 --- a/Telegram/SourceFiles/overview/overview.style +++ b/Telegram/SourceFiles/overview/overview.style @@ -20,6 +20,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org */ using "basic.style"; using "history/history.style"; +using "ui/widgets/widgets.style"; using "media/view/mediaview.style"; OverviewFileLayout { @@ -116,3 +117,15 @@ overviewLinksChecked: icon { { "overview_links_check_bg", overviewCheckedBg }, { "overview_links_check", #ffffff, point(4px, 5px) }, }; + +overviewFilter: flatInput(inpDefGray) { + font: font(fsize); + bgColor: #f2f2f2; + phColor: #949494; + phFocusColor: #a4a4a4; + icon: fieldSearchIcon; + + width: 240px; + height: 32px; + textMrg: margins(32px, 3px, 32px, 3px); +} diff --git a/Telegram/SourceFiles/overviewwidget.cpp b/Telegram/SourceFiles/overviewwidget.cpp index 7172ff36ba..d5b19764cb 100644 --- a/Telegram/SourceFiles/overviewwidget.cpp +++ b/Telegram/SourceFiles/overviewwidget.cpp @@ -54,7 +54,7 @@ OverviewInner::OverviewInner(OverviewWidget *overview, ScrollArea *scroll, PeerD , _history(App::history(_peer->id)) , _channel(peerToChannel(_peer->id)) , _rowWidth(st::msgMinWidth) -, _search(this, st::dialogsFilter, lang(lng_dlg_filter)) +, _search(this, st::overviewFilter, lang(lng_dlg_filter)) , _cancelSearch(this, st::dialogsCancelSearch) , _itemsToBeLoaded(LinksOverviewPerPage * 2) , _width(st::windowMinWidth) {