From 96e33120019a037c4a66e7c0b726484935449974 Mon Sep 17 00:00:00 2001 Message-Id: <96e33120019a037c4a66e7c0b726484935449974.1714776117.git.mdw@distorted.org.uk> From: Mark Wooding Date: Fri, 20 Jul 2018 12:02:06 +0100 Subject: [PATCH] disobedience/control.c: Follow user toolbar style in full-size window. Organization: Straylight/Edgeware From: Mark Wooding Compact mode forces the icons-only style still, because smaller. --- disobedience/control.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/disobedience/control.c b/disobedience/control.c index 6b3c106..40f347a 100644 --- a/disobedience/control.c +++ b/disobedience/control.c @@ -271,8 +271,8 @@ GtkWidget *control_widget(void) { * sliders hang down from the toolbar so it unavoidably gets the whole width * of the window to play with. */ gtk_toolbar_set_show_arrow(GTK_TOOLBAR(toolbar), FALSE); - gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), - full_mode ? GTK_TOOLBAR_BOTH : GTK_TOOLBAR_ICONS); + if(full_mode) gtk_toolbar_unset_style(GTK_TOOLBAR(toolbar)); + else gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS); for(n = 0; n < NICONS; ++n) { struct icon *const icon = &icons[n]; icon->button = (icon->toggle @@ -617,8 +617,8 @@ static void control_minimode(const char attribute((unused)) *event, gtk_widget_hide(balance_widget); gtk_scale_set_value_pos(GTK_SCALE(volume_widget), GTK_POS_RIGHT); } - gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), - full_mode ? GTK_TOOLBAR_BOTH : GTK_TOOLBAR_ICONS); + if(full_mode) gtk_toolbar_unset_style(GTK_TOOLBAR(toolbar)); + else gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS); } /* -- [mdw]