Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move header bar buttons into button box #218

Merged
merged 3 commits into from Mar 14, 2020
Merged

Move header bar buttons into button box #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c75f02
Sui(improve): move connect button join button into button box
SilverRainZ Mar 13, 2020
de137c8
Sui(improve): add padding for header bar when CSD disabled
SilverRainZ Mar 13, 2020
4020eb6
Sui(fix): hide header box when CSD enabled
SilverRainZ Mar 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions data/themes/default-min.css
View file
Open in desktop
Expand Up @@ -6,6 +6,12 @@
* @date 2016-05-24
*/

/* Header bar {{{1 */

.sui-nocsd-header-bar {
padding: 2px;
}

/* Side bar {{{1 */
.sui-side-bar-item > * {
margin-bottom: 6px
Expand Down
61 changes: 41 additions & 20 deletions data/ui/window.glade
View file
Open in desktop
Expand Up @@ -75,35 +75,50 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkButton" id="connect_button">
<object class="GtkButtonBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="focus_on_click">False</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Connect</property>
<property name="image">connect_image</property>
<property name="layout_style">expand</property>
<child>
<object class="GtkButton" id="connect_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Connect</property>
<property name="image">connect_image</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="join_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Join</property>
<property name="image">join_image</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<style>
<class name="linked"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="join_button">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="focus_on_click">False</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Join</property>
<property name="image">join_image</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="pack_type">end</property>
Expand Down Expand Up @@ -210,6 +225,9 @@
<child>
<placeholder/>
</child>
<style>
<class name="sui-nocsd-header-bar"/>
</style>
</object>
<packing>
<property name="resize">False</property>
Expand All @@ -229,6 +247,9 @@
<child>
<placeholder/>
</child>
<style>
<class name="sui-nocsd-header-bar"/>
</style>
</object>
<packing>
<property name="resize">True</property>
Expand Down
8 changes: 6 additions & 2 deletions src/sui/sui_window.c
View file
Open in desktop
Expand Up @@ -57,8 +57,8 @@ struct _SuiWindow {
GtkPaned *title_paned;
GtkBox *window_box;
GtkSeparator *header_separator;
GtkStack *header_box;
GtkStack *header_paned;
GtkBox *header_box;
GtkPaned *header_paned;
GtkStack *window_stack;

/* Side header */
Expand Down Expand Up @@ -266,6 +266,8 @@ static void sui_window_constructed(GObject *object){

self = SUI_WINDOW(object);
if (!self->cfg->csd){
gtk_widget_show(GTK_WIDGET(self->header_box));

/* Move side header widgets from side_header_bar to side_header_box */
gtk_container_remove(GTK_CONTAINER(self->side_header_bar),
GTK_WIDGET(self->side_left_header_box));
Expand Down Expand Up @@ -294,6 +296,8 @@ static void sui_window_constructed(GObject *object){
// Show the seperator
gtk_widget_show(GTK_WIDGET(self->header_separator));
} else {
gtk_widget_hide(GTK_WIDGET(self->header_box));

// Use appliaction icon instead of standard icon when CSD enabled
gtk_image_set_from_icon_name(self->start_image, PACKAGE,
GTK_ICON_SIZE_BUTTON);
Expand Down