Skip to content

Commit 9927b5e

Browse files
JosephMccmtwebster
JosephMcc
authored and
mtwebster
committed
nemo-toolbar.c: Use flat button style
Quite a few years ago we changed to using the raised button style that was popular at the time. Now some themes are going out of our their way to get rid of that style. So just go back to using the flatter style.
1 parent 3fc2db7 commit 9927b5e

1 file changed

Lines changed: 22 additions & 114 deletions

File tree

‎src/nemo-toolbar.c‎

Lines changed: 22 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,6 @@ struct _NemoToolbarPriv {
5757
GtkWidget *compact_view_button;
5858
GtkWidget *show_thumbnails_button;
5959

60-
GtkToolItem *navigation_box;
61-
GtkToolItem *refresh_box;
62-
GtkToolItem *location_box;
63-
GtkToolItem *tools_box;
64-
GtkToolItem *view_box;
65-
6660
GtkWidget *path_bar;
6761
GtkWidget *location_bar;
6862
GtkWidget *root_bar;
@@ -119,7 +113,7 @@ toolbar_update_appearance (NemoToolbar *self)
119113

120114
gtk_widget_set_visible (self->priv->root_bar,
121115
self->priv->show_root_bar);
122-
116+
123117
/* Please refer to the element name, not the action name after the forward slash, otherwise the prefs will not work*/
124118

125119
widgetitem = self->priv->previous_button;
@@ -161,7 +155,7 @@ toolbar_update_appearance (NemoToolbar *self)
161155
icon_toolbar = g_settings_get_boolean (nemo_preferences, NEMO_PREFERENCES_SHOW_NEW_FOLDER_ICON_TOOLBAR);
162156
if ( icon_toolbar == FALSE ) { gtk_widget_hide (widgetitem); }
163157
else {gtk_widget_show (GTK_WIDGET(widgetitem));}
164-
158+
165159
widgetitem = self->priv->open_terminal_button;
166160
icon_toolbar = g_settings_get_boolean (nemo_preferences, NEMO_PREFERENCES_SHOW_OPEN_IN_TERMINAL_TOOLBAR);
167161
if (icon_toolbar == FALSE ) {gtk_widget_hide (widgetitem); }
@@ -186,55 +180,11 @@ toolbar_update_appearance (NemoToolbar *self)
186180
icon_toolbar = g_settings_get_boolean (nemo_preferences, NEMO_PREFERENCES_SHOW_COMPACT_VIEW_ICON_TOOLBAR);
187181
if ( icon_toolbar == FALSE ) { gtk_widget_hide (widgetitem); }
188182
else {gtk_widget_show (GTK_WIDGET(widgetitem));}
189-
183+
190184
widgetitem = self->priv->show_thumbnails_button;
191185
icon_toolbar = g_settings_get_boolean (nemo_preferences, NEMO_PREFERENCES_SHOW_SHOW_THUMBNAILS_TOOLBAR);
192186
if ( icon_toolbar == FALSE ) { gtk_widget_hide (widgetitem); }
193187
else {gtk_widget_show (GTK_WIDGET(widgetitem));}
194-
195-
if (gtk_widget_get_visible(self->priv->previous_button) == FALSE &&
196-
gtk_widget_get_visible(self->priv->next_button) == FALSE &&
197-
gtk_widget_get_visible(self->priv->up_button) == FALSE)
198-
{
199-
gtk_widget_hide(GTK_WIDGET (self->priv->navigation_box));
200-
} else {
201-
gtk_widget_show(GTK_WIDGET (self->priv->navigation_box));
202-
}
203-
204-
if (gtk_widget_get_visible(self->priv->home_button) == FALSE &&
205-
gtk_widget_get_visible(self->priv->computer_button) == FALSE)
206-
{
207-
gtk_widget_hide(GTK_WIDGET (self->priv->location_box));
208-
} else {
209-
gtk_widget_show(GTK_WIDGET (self->priv->location_box));
210-
}
211-
212-
if (gtk_widget_get_visible(self->priv->refresh_button) == FALSE)
213-
{
214-
gtk_widget_hide(GTK_WIDGET (self->priv->refresh_box));
215-
} else {
216-
gtk_widget_show(GTK_WIDGET (self->priv->refresh_box));
217-
}
218-
219-
if (gtk_widget_get_visible(self->priv->search_button) == FALSE &&
220-
gtk_widget_get_visible(self->priv->new_folder_button) == FALSE &&
221-
gtk_widget_get_visible(self->priv->open_terminal_button) == FALSE &&
222-
gtk_widget_get_visible(self->priv->toggle_location_button) == FALSE &&
223-
gtk_widget_get_visible(self->priv->show_thumbnails_button) == FALSE)
224-
{
225-
gtk_widget_hide(GTK_WIDGET (self->priv->tools_box));
226-
} else {
227-
gtk_widget_show(GTK_WIDGET (self->priv->tools_box));
228-
}
229-
230-
if (gtk_widget_get_visible(self->priv->icon_view_button) == FALSE &&
231-
gtk_widget_get_visible(self->priv->list_view_button) == FALSE &&
232-
gtk_widget_get_visible(self->priv->compact_view_button) == FALSE)
233-
{
234-
gtk_widget_hide(GTK_WIDGET (self->priv->view_box));
235-
} else {
236-
gtk_widget_show(GTK_WIDGET (self->priv->view_box));
237-
}
238188
}
239189

240190
static void
@@ -275,6 +225,7 @@ toolbar_create_toolbutton (NemoToolbar *self,
275225
gtk_activatable_set_related_action (GTK_ACTIVATABLE (button), action);
276226
gtk_button_set_label (GTK_BUTTON (button), NULL);
277227
gtk_widget_set_tooltip_text (button, gtk_action_get_tooltip (action));
228+
gtk_style_context_add_class (gtk_widget_get_style_context (button), GTK_STYLE_CLASS_FLAT);
278229

279230
return button;
280231
}
@@ -303,13 +254,13 @@ nemo_toolbar_constructed (GObject *obj)
303254
toolbar = gtk_toolbar_new ();
304255
self->priv->toolbar = toolbar;
305256
gtk_box_pack_start (GTK_BOX (self), self->priv->toolbar, TRUE, TRUE, 0);
306-
257+
307258
context = gtk_widget_get_style_context (GTK_WIDGET(toolbar));
308259
gtk_style_context_add_class (context, GTK_STYLE_CLASS_PRIMARY_TOOLBAR);
309-
310-
/* Back/Forward/Up */
311-
self->priv->navigation_box = gtk_tool_item_new ();
312-
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
260+
261+
/* Left side of the toolbar */
262+
tool_box = gtk_tool_item_new ();
263+
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
313264

314265
self->priv->previous_button = toolbar_create_toolbutton (self, FALSE, NEMO_ACTION_BACK);
315266
gtk_container_add (GTK_CONTAINER (box), self->priv->previous_button);
@@ -320,47 +271,20 @@ nemo_toolbar_constructed (GObject *obj)
320271
self->priv->up_button = toolbar_create_toolbutton (self, FALSE, NEMO_ACTION_UP);
321272
gtk_container_add (GTK_CONTAINER (box), self->priv->up_button);
322273

323-
gtk_style_context_add_class (gtk_widget_get_style_context (box), GTK_STYLE_CLASS_RAISED);
324-
gtk_style_context_add_class (gtk_widget_get_style_context (box), GTK_STYLE_CLASS_LINKED);
325-
326-
gtk_container_add (GTK_CONTAINER (self->priv->navigation_box), GTK_WIDGET (box));
327-
gtk_container_add (GTK_CONTAINER (self->priv->toolbar), GTK_WIDGET (self->priv->navigation_box));
328-
329-
gtk_widget_show_all (GTK_WIDGET (self->priv->navigation_box));
330-
gtk_widget_set_margin_right (GTK_WIDGET (self->priv->navigation_box), 6);
331-
332-
/* Refresh */
333-
self->priv->refresh_box = gtk_tool_item_new ();
334-
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
335-
336274
self->priv->refresh_button = toolbar_create_toolbutton (self, FALSE, NEMO_ACTION_RELOAD);
337275
gtk_container_add (GTK_CONTAINER (box), self->priv->refresh_button);
338-
gtk_style_context_add_class (gtk_widget_get_style_context (box), GTK_STYLE_CLASS_RAISED);
339-
340-
gtk_container_add (GTK_CONTAINER (self->priv->refresh_box), GTK_WIDGET (box));
341-
gtk_container_add (GTK_CONTAINER (self->priv->toolbar), GTK_WIDGET (self->priv->refresh_box));
342-
343-
gtk_widget_show_all (GTK_WIDGET (self->priv->refresh_box));
344-
gtk_widget_set_margin_right (GTK_WIDGET (self->priv->refresh_box), 6);
345-
346-
/* Home/Computer */
347-
self->priv->location_box = gtk_tool_item_new ();
348-
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
349276

350277
self->priv->home_button = toolbar_create_toolbutton (self, FALSE, NEMO_ACTION_HOME);
351278
gtk_container_add (GTK_CONTAINER (box), self->priv->home_button);
352279

353280
self->priv->computer_button = toolbar_create_toolbutton (self, FALSE, NEMO_ACTION_COMPUTER);
354281
gtk_container_add (GTK_CONTAINER (box), self->priv->computer_button);
355282

356-
gtk_style_context_add_class (gtk_widget_get_style_context (box), GTK_STYLE_CLASS_RAISED);
357-
gtk_style_context_add_class (gtk_widget_get_style_context (box), GTK_STYLE_CLASS_LINKED);
358-
359-
gtk_container_add (GTK_CONTAINER (self->priv->location_box), GTK_WIDGET (box));
360-
gtk_container_add (GTK_CONTAINER (self->priv->toolbar), GTK_WIDGET (self->priv->location_box));
283+
gtk_container_add (GTK_CONTAINER (tool_box), GTK_WIDGET (box));
284+
gtk_container_add (GTK_CONTAINER (self->priv->toolbar), GTK_WIDGET (tool_box));
361285

362-
gtk_widget_show_all (GTK_WIDGET (self->priv->location_box));
363-
gtk_widget_set_margin_right (GTK_WIDGET (self->priv->location_box), 6);
286+
gtk_widget_show_all (GTK_WIDGET (tool_box));
287+
gtk_widget_set_margin_right (GTK_WIDGET (tool_box), 6);
364288

365289
/* Container to hold the location and pathbars */
366290
self->priv->stack = gtk_stack_new();
@@ -373,7 +297,7 @@ nemo_toolbar_constructed (GObject *obj)
373297

374298
self->priv->path_bar = g_object_new (NEMO_TYPE_PATH_BAR, NULL);
375299
gtk_stack_add_named(GTK_STACK (self->priv->stack), GTK_WIDGET (self->priv->path_bar), "path_bar");
376-
300+
377301
/* Entry-Like Location Bar */
378302
self->priv->location_bar = nemo_location_bar_new ();
379303
gtk_stack_add_named(GTK_STACK (self->priv->stack), GTK_WIDGET (self->priv->location_bar), "location_bar");
@@ -385,9 +309,9 @@ nemo_toolbar_constructed (GObject *obj)
385309
gtk_container_add (GTK_CONTAINER (self->priv->toolbar), GTK_WIDGET (tool_box));
386310
gtk_widget_show (GTK_WIDGET (tool_box));
387311

388-
/* Search/Open in Terminal/New Folder/Toggle Location */
389-
self->priv->tools_box = gtk_tool_item_new ();
390-
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
312+
/* Right Side of the toolbar */
313+
tool_box = gtk_tool_item_new ();
314+
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
391315

392316
self->priv->toggle_location_button = toolbar_create_toolbutton (self, FALSE, NEMO_ACTION_TOGGLE_LOCATION);
393317
gtk_container_add (GTK_CONTAINER (box), self->priv->toggle_location_button);
@@ -400,25 +324,12 @@ nemo_toolbar_constructed (GObject *obj)
400324

401325
self->priv->search_button = toolbar_create_toolbutton (self, TRUE, NEMO_ACTION_SEARCH);
402326
gtk_container_add (GTK_CONTAINER (box), self->priv->search_button);
403-
327+
404328
self->priv->show_thumbnails_button = toolbar_create_toolbutton (self, TRUE, NEMO_ACTION_SHOW_THUMBNAILS);
405329
gtk_container_add (GTK_CONTAINER (box), self->priv->show_thumbnails_button);
406330

407-
gtk_style_context_add_class (gtk_widget_get_style_context (box), GTK_STYLE_CLASS_RAISED);
408-
gtk_style_context_add_class (gtk_widget_get_style_context (box), GTK_STYLE_CLASS_LINKED);
409-
410-
gtk_container_add (GTK_CONTAINER (self->priv->tools_box), GTK_WIDGET (box));
411-
gtk_container_add (GTK_CONTAINER (self->priv->toolbar), GTK_WIDGET (self->priv->tools_box));
412-
413-
gtk_widget_show_all (GTK_WIDGET (self->priv->tools_box));
414-
gtk_widget_set_margin_left (GTK_WIDGET (self->priv->tools_box), 6);
415-
416331
setup_root_info_bar (self);
417332

418-
/* View Select */
419-
self->priv->view_box = gtk_tool_item_new ();
420-
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
421-
422333
self->priv->icon_view_button = toolbar_create_toolbutton (self, TRUE, NEMO_ACTION_ICON_VIEW);
423334
gtk_container_add (GTK_CONTAINER (box), self->priv->icon_view_button);
424335

@@ -428,14 +339,11 @@ nemo_toolbar_constructed (GObject *obj)
428339
self->priv->compact_view_button = toolbar_create_toolbutton (self, TRUE, NEMO_ACTION_COMPACT_VIEW);
429340
gtk_container_add (GTK_CONTAINER (box), self->priv->compact_view_button);
430341

431-
gtk_style_context_add_class (gtk_widget_get_style_context (box), GTK_STYLE_CLASS_RAISED);
432-
gtk_style_context_add_class (gtk_widget_get_style_context (box), GTK_STYLE_CLASS_LINKED);
433-
434-
gtk_container_add (GTK_CONTAINER (self->priv->view_box), GTK_WIDGET (box));
435-
gtk_container_add (GTK_CONTAINER (self->priv->toolbar), GTK_WIDGET (self->priv->view_box));
342+
gtk_container_add (GTK_CONTAINER (tool_box), GTK_WIDGET (box));
343+
gtk_container_add (GTK_CONTAINER (self->priv->toolbar), GTK_WIDGET (tool_box));
436344

437-
gtk_widget_show_all (GTK_WIDGET (self->priv->view_box));
438-
gtk_widget_set_margin_left (GTK_WIDGET (self->priv->view_box), 6);
345+
gtk_widget_show_all (GTK_WIDGET (tool_box));
346+
gtk_widget_set_margin_left (GTK_WIDGET (tool_box), 6);
439347

440348
/* nemo patch */
441349
g_signal_connect_swapped (nemo_preferences,

0 commit comments

Comments
 (0)