[gnome-contacts] ListPane: don't put the filter_entry in a toolbar
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-contacts] ListPane: don't put the filter_entry in a toolbar
- Date: Mon, 22 Jan 2018 20:39:51 +0000 (UTC)
commit a29d7b43e78d045a17182ae6cd54afe160cd7ebc
Author: Niels De Graef <nielsdegraef gmail com>
Date: Mon Jan 22 21:28:59 2018 +0100
ListPane: don't put the filter_entry in a toolbar
data/ui/contacts-list-pane.ui | 36 ++++++++----------------------------
data/ui/style.css | 8 --------
2 files changed, 8 insertions(+), 36 deletions(-)
---
diff --git a/data/ui/contacts-list-pane.ui b/data/ui/contacts-list-pane.ui
index e5c3af3..87b0b1f 100644
--- a/data/ui/contacts-list-pane.ui
+++ b/data/ui/contacts-list-pane.ui
@@ -12,39 +12,19 @@
<property name="orientation">vertical</property>
<property name="visible">True</property>
<child>
- <object class="GtkToolbar">
+ <object class="GtkSearchEntry" id="filter_entry">
<property name="visible">True</property>
- <property name="icon_size">1</property>
- <property name="hexpand">True</property>
- <property name="vexpand">False</property>
- <style>
- <class name="primary-toolbar"/>
- </style>
- <child>
- <object class="GtkToolItem" id="search_tool_item">
- <property name="visible">True</property>
- <child>
- <object class="GtkSearchEntry" id="filter_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="primary_icon_name">edit-find-symbolic</property>
- <property name="primary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">False</property>
- <property name="placeholder_text" translatable="yes">Type to search</property>
- <signal name="search_changed" handler="filter_entry_changed" object="ContactsListPane"
after="no" swapped="no"/>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="primary_icon_name">edit-find-symbolic</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">False</property>
+ <property name="margin">6</property>
+ <property name="placeholder_text" translatable="yes">Type to search</property>
+ <signal name="search_changed" handler="filter_entry_changed" object="ContactsListPane"
after="no" swapped="no"/>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
diff --git a/data/ui/style.css b/data/ui/style.css
index 067c6f8..80df213 100644
--- a/data/ui/style.css
+++ b/data/ui/style.css
@@ -62,14 +62,6 @@ row.contact-data-row {
margin: 4px 8px;
}
-/* Primary toolbar with no line at top to avoid conflicts with frame border */
-ContactsWindow .primary-toolbar.toolbar {
- border-width: 0;
- border-bottom-width: 1px;
- border-style: solid;
- border-color: @borders;
-}
-
.contacts-postal-entry {
border-radius: 0 0 0 0;
border-width: 1px 1px 0 1px;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]