feat(ui): add toggle panel button

Closes #24
jtheoof · Jun 14, 2020 · 7674d7d · 7674d7d
1 parent 82ec80e
commit 7674d7d
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 7 deletions.
diff --git a/include/application.h b/include/application.h
@@ -12,6 +12,7 @@ void window_keypress_handler(GtkWidget *widget, GdkEventKey *event,
 gboolean window_delete_handler(GtkWidget *widget, GdkEvent *event,
                                struct swappy_state *state);
 
+void pane_toggled_handler(GtkWidget *widget, struct swappy_state *state);
 void undo_clicked_handler(GtkWidget *widget, struct swappy_state *state);
 void redo_clicked_handler(GtkWidget *widget, struct swappy_state *state);
 

diff --git a/include/swappy.h b/include/swappy.h
@@ -110,9 +110,13 @@ struct swappy_state_settings {
 };
 
 struct swappy_state_ui {
+  gboolean panel_toggled;
+
   GtkWindow *window;
   GtkWidget *area;
 
+  GtkToggleButton *panel_toggle_button;
+
   // Undo / Redo
   GtkButton *undo;
   GtkButton *redo;

diff --git a/res/swappy.glade b/res/swappy.glade
@@ -27,6 +27,11 @@
     <property name="can_focus">False</property>
     <property name="icon_name">document-save</property>
   </object>
+  <object class="GtkImage" id="img-toggle-panel">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">document-properties</property>
+  </object>
   <object class="GtkImage" id="zoom-in">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -621,6 +626,31 @@
       <object class="GtkHeaderBar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="spacing">10</property>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkToggleButton" id="btn-toggle-panel">
+                <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">Toggle Paint Panel</property>
+                <property name="image">img-toggle-panel</property>
+                <property name="always_show_image">True</property>
+                <signal name="toggled" handler="pane_toggled_handler" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+        </child>
         <child>
           <object class="GtkButtonBox">
             <property name="visible">True</property>
@@ -686,6 +716,9 @@
               </packing>
             </child>
           </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
         </child>
         <child>
           <object class="GtkBox" id="control_box">
@@ -727,7 +760,7 @@
           </object>
           <packing>
             <property name="pack_type">end</property>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child>
@@ -748,7 +781,7 @@
             </child>
           </object>
           <packing>
-            <property name="position">2</property>
+            <property name="position">3</property>
           </packing>
         </child>
       </object>

diff --git a/src/application.c b/src/application.c
@@ -43,6 +43,15 @@ static void update_ui_text_size_widget(struct swappy_state *state) {
   gtk_button_set_label(button, label);
 }
 
+static void update_ui_panel_toggle_button(struct swappy_state *state) {
+  GtkWidget *painting_box = GTK_WIDGET(state->ui->painting_box);
+  GtkToggleButton *button = GTK_TOGGLE_BUTTON(state->ui->panel_toggle_button);
+  gboolean toggled = state->ui->panel_toggled;
+
+  gtk_toggle_button_set_active(button, toggled);
+  gtk_widget_set_visible(painting_box, toggled);
+}
+
 static void action_undo(struct swappy_state *state) {
   GList *first = state->paints;
 
@@ -73,10 +82,11 @@ static void action_clear(struct swappy_state *state) {
   update_ui_undo_redo(state);
 }
 
-static void action_toggle_painting_pane(struct swappy_state *state) {
-  GtkWidget *painting_box = GTK_WIDGET(state->ui->painting_box);
-  gboolean is_visible = gtk_widget_get_visible(painting_box);
-  gtk_widget_set_visible(painting_box, !is_visible);
+static void action_toggle_painting_panel(struct swappy_state *state,
+                                         gboolean *toggled) {
+  state->ui->panel_toggled =
+      (toggled == NULL) ? !state->ui->panel_toggled : *toggled;
+  update_ui_panel_toggle_button(state);
 }
 
 static void action_update_color_state(struct swappy_state *state, double r,
@@ -267,7 +277,7 @@ void window_keypress_handler(GtkWidget *widget, GdkEventKey *event,
         save_state_to_file_or_folder(state, NULL);
         break;
       case GDK_KEY_b:
-        action_toggle_painting_pane(state);
+        action_toggle_painting_panel(state, NULL);
         break;
       case GDK_KEY_w:
         gtk_main_quit();
@@ -356,6 +366,12 @@ gboolean window_delete_handler(GtkWidget *widget, GdkEvent *event,
   return FALSE;
 }
 
+void pane_toggled_handler(GtkWidget *widget, struct swappy_state *state) {
+  GtkToggleButton *button = GTK_TOGGLE_BUTTON(widget);
+  gboolean toggled = gtk_toggle_button_get_active(button);
+  action_toggle_painting_panel(state, &toggled);
+}
+
 void undo_clicked_handler(GtkWidget *widget, struct swappy_state *state) {
   action_undo(state);
 }
@@ -591,6 +607,9 @@ static bool load_layout(struct swappy_state *state) {
 
   g_signal_connect(window, "destroy", G_CALLBACK(on_destroy), state);
 
+  state->ui->panel_toggle_button =
+      GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "btn-toggle-panel"));
+
   state->ui->undo = GTK_BUTTON(gtk_builder_get_object(builder, "undo-button"));
   state->ui->redo = GTK_BUTTON(gtk_builder_get_object(builder, "redo-button"));
 
@@ -667,6 +686,7 @@ static bool init_gtk_window(struct swappy_state *state) {
   update_ui_stroke_size_widget(state);
   update_ui_text_size_widget(state);
   update_ui_undo_redo(state);
+  update_ui_panel_toggle_button(state);
 
   return true;
 }
@@ -771,6 +791,7 @@ bool application_init(struct swappy_state *state) {
   g_application_add_main_option_entries(G_APPLICATION(state->app), cli_options);
 
   state->ui = g_new(struct swappy_state_ui, 1);
+  state->ui->panel_toggled = false;
 
   g_signal_connect(state->app, "command-line", G_CALLBACK(command_line_handler),
                    state);