Remove toolbar icon size options other than large and small

lxde · Mar 16, 2021 · 703accd · 703accd
1 parent 35a6bd6
commit 703accd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/data/ui/lxappearance.glade b/data/ui/lxappearance.glade
@@ -2125,24 +2125,12 @@
       <column type="gchararray"/>
     </columns>
     <data>
-      <row>
-        <col id="0" translatable="yes">Same as menu items</col>
-      </row>
       <row>
         <col id="0" translatable="yes">Small toolbar icon</col>
       </row>
       <row>
         <col id="0" translatable="yes">Large toolbar icon</col>
       </row>
-      <row>
-        <col id="0" translatable="yes">Same as buttons</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Same as drag icons</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Same as dialogs</col>
-      </row>
     </data>
   </object>
   <object class="GtkListStore" id="tb_style_store">

diff --git a/src/other.c b/src/other.c
@@ -30,7 +30,7 @@ static void on_tb_style_changed(GtkComboBox* combo, gpointer user_data)
 
 static void on_tb_icon_size_changed(GtkComboBox* combo, gpointer user_data)
 {
-    app.toolbar_icon_size = gtk_combo_box_get_active(combo) + GTK_ICON_SIZE_MENU;
+    app.toolbar_icon_size = gtk_combo_box_get_active(combo) + GTK_ICON_SIZE_SMALL_TOOLBAR;
     lxappearance_changed();
 }
 
@@ -72,7 +72,7 @@ void other_init(GtkBuilder* b)
     g_signal_connect(app.tb_style_combo, "changed", G_CALLBACK(on_tb_style_changed), NULL);
 
     app.tb_icon_size_combo = GTK_WIDGET(gtk_builder_get_object(b, "tb_icon_size"));
-    idx = app.toolbar_icon_size - GTK_ICON_SIZE_MENU;
+    idx = app.toolbar_icon_size - GTK_ICON_SIZE_SMALL_TOOLBAR;
     gtk_combo_box_set_active(GTK_COMBO_BOX(app.tb_icon_size_combo), idx);
     g_signal_connect(app.tb_icon_size_combo, "changed", G_CALLBACK(on_tb_icon_size_changed), NULL);