diff options
author | ouwou <26526779+ouwou@users.noreply.github.com> | 2020-08-25 22:10:39 -0400 |
---|---|---|
committer | ouwou <26526779+ouwou@users.noreply.github.com> | 2020-08-25 22:10:39 -0400 |
commit | 82a21bd08558ba3e067f490525431be30f978b25 (patch) | |
tree | 5695ccc11939e0de3a0fa012e73d8071dd97ce3b /windows | |
parent | 6b72931ba729bf6ede33cfa6877a5ad21e913c45 (diff) | |
download | abaddon-portaudio-82a21bd08558ba3e067f490525431be30f978b25.tar.gz abaddon-portaudio-82a21bd08558ba3e067f490525431be30f978b25.zip |
fix guild order, add copy id guild, add broken zlib, start member list
Diffstat (limited to 'windows')
-rw-r--r-- | windows/mainwindow.cpp | 29 | ||||
-rw-r--r-- | windows/mainwindow.hpp | 3 |
2 files changed, 25 insertions, 7 deletions
diff --git a/windows/mainwindow.cpp b/windows/mainwindow.cpp index 41f7ee8..3404799 100644 --- a/windows/mainwindow.cpp +++ b/windows/mainwindow.cpp @@ -4,9 +4,10 @@ MainWindow::MainWindow() : m_main_box(Gtk::ORIENTATION_VERTICAL) , m_content_box(Gtk::ORIENTATION_HORIZONTAL) - , m_chan_chat_paned(Gtk::ORIENTATION_HORIZONTAL) { + , m_chan_chat_paned(Gtk::ORIENTATION_HORIZONTAL) + , m_chat_members_paned(Gtk::ORIENTATION_HORIZONTAL) { set_default_size(1200, 800); - + m_menu_discord.set_label("Discord"); m_menu_discord.set_submenu(m_menu_discord_sub); m_menu_discord_connect.set_label("Connect"); @@ -39,18 +40,32 @@ MainWindow::MainWindow() m_main_box.add(m_content_box); auto *channel_list = m_channel_list.GetRoot(); - channel_list->set_vexpand(true); - channel_list->set_size_request(-1, -1); - m_chan_chat_paned.pack1(*channel_list); + auto *member_list = m_members.GetRoot(); auto *chat = m_chat.GetRoot(); + chat->set_vexpand(true); chat->set_hexpand(true); - m_chan_chat_paned.pack2(*chat); - m_chan_chat_paned.set_position(200); + + channel_list->set_vexpand(true); + channel_list->set_size_request(-1, -1); + + member_list->set_vexpand(true); + + m_chan_chat_paned.pack1(*channel_list); + m_chan_chat_paned.pack2(m_chat_members_paned); m_chan_chat_paned.child_property_shrink(*channel_list) = true; m_chan_chat_paned.child_property_resize(*channel_list) = true; + m_chan_chat_paned.set_position(200); m_content_box.add(m_chan_chat_paned); + m_chat_members_paned.pack1(*chat); + m_chat_members_paned.pack2(*member_list); + m_chat_members_paned.child_property_shrink(*member_list) = true; + m_chat_members_paned.child_property_resize(*member_list) = true; + int w, h; + get_default_size(w, h); // :s + m_chat_members_paned.set_position(w - m_chan_chat_paned.get_position() - 150); + add(m_main_box); show_all_children(); diff --git a/windows/mainwindow.hpp b/windows/mainwindow.hpp index 240d744..f3085f5 100644 --- a/windows/mainwindow.hpp +++ b/windows/mainwindow.hpp @@ -1,6 +1,7 @@ #pragma once #include "../components/channels.hpp" #include "../components/chatwindow.hpp" +#include "../components/memberlist.hpp" #include <gtkmm.h> class Abaddon; @@ -20,9 +21,11 @@ protected: Gtk::Box m_main_box; Gtk::Box m_content_box; Gtk::Paned m_chan_chat_paned; + Gtk::Paned m_chat_members_paned; ChannelList m_channel_list; ChatWindow m_chat; + MemberList m_members; Gtk::MenuBar m_menu_bar; Gtk::MenuItem m_menu_discord; |