From 405459e93be718b0e6aad26746036105dd3f3226 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sat, 3 Nov 2018 06:04:57 +0100 Subject: Improve top bar, have to fix banding... --- src/ChatWindow.cpp | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'src/ChatWindow.cpp') diff --git a/src/ChatWindow.cpp b/src/ChatWindow.cpp index 273f0e0..b53e337 100644 --- a/src/ChatWindow.cpp +++ b/src/ChatWindow.cpp @@ -57,17 +57,31 @@ namespace dchat topbar.set_hexpand(true); attach(topbar, 0, 0, 2, 1); - topbarSearchBar.set_size_request(175); + Gtk::Grid *topbarLeft = Gtk::manage(new Gtk::Grid()); + topbarLeft->set_name("top-bar-left"); + topbarLeft->set_size_request(180); + topbarLeft->set_valign(Gtk::ALIGN_CENTER); + topbarLeft->set_halign(Gtk::ALIGN_CENTER); + topbar.attach(*topbarLeft, 0, 0, 1, 1); + topbarSearchBar.set_name("top-bar-search"); topbarSearchBar.set_placeholder_text("Search..."); - topbar.attach(topbarSearchBar, 0, 0, 1, 1); + topbarSearchBar.set_size_request(180); + topbarLeft->attach(topbarSearchBar, 0, 0, 1, 1); - Gtk::Alignment *topbarSpacer = Gtk::manage(new Gtk::Alignment()); - topbarSpacer->set_size_request(50); - topbar.attach_next_to(*topbarSpacer, topbarSearchBar, Gtk::POS_RIGHT, 1, 1); + Gtk::Grid *topbarRight = Gtk::manage(new Gtk::Grid()); + topbarRight->set_name("top-bar-right"); + topbarRight->set_hexpand(true); + topbarRight->set_valign(Gtk::ALIGN_CENTER); + topbar.attach_next_to(*topbarRight, *topbarLeft, Gtk::POS_RIGHT, 1, 1); currentChannelTitle.set_name("current-room-title"); - topbar.attach_next_to(currentChannelTitle, *topbarSpacer, Gtk::POS_RIGHT, 1, 1); + currentChannelTitle.set_hexpand(true); + currentChannelTitle.set_alignment(Gtk::ALIGN_START, Gtk::ALIGN_CENTER); + topbarRight->attach(currentChannelTitle, 0, 0, 1, 1); + + ImageButton *channelSettings = Gtk::manage(new ImageButton("images/settings-icon.png", nullptr)); + topbarRight->attach_next_to(*channelSettings, currentChannelTitle, Gtk::POS_RIGHT, 1, 1); } void ChatWindow::setupLeftPanel(Gtk::Paned *sidePanels) -- cgit v1.2.3