diff options
| -rw-r--r-- | main/data/main_window.ui | 4 | ||||
| -rw-r--r-- | main/data/style.css | 18 | ||||
| -rw-r--r-- | main/src/ui/main_window.vala | 5 |
3 files changed, 18 insertions, 9 deletions
diff --git a/main/data/main_window.ui b/main/data/main_window.ui index 8ca1b704..806db779 100644 --- a/main/data/main_window.ui +++ b/main/data/main_window.ui @@ -28,7 +28,7 @@ <property name="child"> <object class="AdwToolbarView"> <child type="top"> - <object class="GtkBox"> + <object class="GtkBox" id="conversation_list_toolbar"> <property name="spacing">6</property> <property name="margin-start">6</property> <property name="margin-end">6</property> @@ -39,12 +39,14 @@ <child> <object class="GtkSearchEntry" id="conversation_search_entry"> <property name="hexpand">True</property> + <property name="valign">center</property> <property name="placeholder-text" translatable="yes">Search conversations</property> </object> </child> <child> <object class="GtkMenuButton" id="menu_button"> <property name="has-frame">False</property> + <property name="valign">center</property> <child> <object class="GtkImage"> <property name="icon-name">dino-open-menu-symbolic</property> diff --git a/main/data/style.css b/main/data/style.css index 64394cae..c84551e6 100644 --- a/main/data/style.css +++ b/main/data/style.css @@ -9,18 +9,15 @@ statuspage { opacity: 0.5; } -window.dino-main headerbar.dino-chat-headerbar { +window.dino-main headerbar.dino-chat-headerbar, +window.dino-main .dino-conversation-list-toolbar { min-height: 44px; } -window.dino-main headerbar.dino-chat-headerbar > windowhandle > box { - padding-top: 5px; - padding-bottom: 5px; -} - +window.dino-main headerbar.dino-chat-headerbar > windowhandle > box, window.dino-main .dino-conversation-list-toolbar { - padding-top: 5px; - padding-bottom: 5px; + padding-top: 0; + padding-bottom: 0; } window.dino-main .dino-conversation undershoot, @@ -308,6 +305,11 @@ window.dino-main box.dino-chatinput.activatable:focus-within { outline-color: color-mix(in srgb, var(--accent-color) 50%, transparent); } +.dino-chatinput textview, +.dino-chatinput textview text { + background: none; +} + .dino-unread-line label { color: @theme_selected_bg_color; } diff --git a/main/src/ui/main_window.vala b/main/src/ui/main_window.vala index e18e0de3..cb873370 100644 --- a/main/src/ui/main_window.vala +++ b/main/src/ui/main_window.vala @@ -16,6 +16,7 @@ public class MainWindow : Gtk.ApplicationWindow { [GtkChild] public SearchEntry conversation_search_entry; [GtkChild] public MenuButton menu_button; + [GtkChild] private unowned Box conversation_list_toolbar; [GtkChild] public Adw.HeaderBar conversation_headerbar; [GtkChild] public Adw.WindowTitle conversation_window_title; @@ -53,6 +54,10 @@ public class MainWindow : Gtk.ApplicationWindow { this.add_css_class("dino-main"); + var header_size_group = new SizeGroup(SizeGroupMode.VERTICAL); + header_size_group.add_widget(conversation_list_toolbar); + header_size_group.add_widget(conversation_headerbar); + ((Widget)this).realize.connect(restore_window_size); conversation_selector.init(stream_interactor); |