feat: revealer-based tool menu

src/application/applicationstate.c

@@ -1,10 +1,12 @@
 #include "./applicationstate.h"
 #include "glib.h"
+#include "gtk/gtkrevealer.h"
 #include "src/core/primitives.h"
 #include "src/core/raster.h"
 #include "src/ui/vektorcanvas.h"
 
 typedef struct button_tool_set_data {
+    GtkRevealer* revealer;
     VektorAppState* state;
     VektorAppTool tool;
 } button_tool_set_data;
@@ -13,10 +15,19 @@ static void appstate_set_tool(GtkButton* button, gpointer user_data) {
     button_tool_set_data* data = (button_tool_set_data*)user_data;
     data->state->selectedTool = data->tool;
 
+    // setting tool makes the sub-tools menu to close
+    gtk_revealer_set_reveal_child(data->revealer, FALSE);
+
     // setting tool also resets selected primitive
     data->state->selectedPrimitive = NULL;
 }
 
+static void appstate_reveal_subtools(GtkButton* button, gpointer user_data) {
+    GtkRevealer* revealer = (GtkRevealer*)user_data;
+    gboolean visible = gtk_revealer_get_reveal_child(revealer);
+    gtk_revealer_set_reveal_child(revealer, !visible);
+}
+
 static void canvas_onclick(GtkGestureClick* gesture, int n_press, double x,
                            double y, gpointer user_data) {
 
@@ -76,6 +87,7 @@ void vektor_appstate_new(VektorWidgetState* wstate, VektorAppState* stateOut) {
     button_tool_set_data* data_linetool = malloc(sizeof(button_tool_set_data));
     data_linetool->state = stateOut;
     data_linetool->tool = VektorLineTool;
+    data_linetool->revealer = wstate->workspaceRevealerShapes;
 
     // populate appstate
     stateOut->primitiveBuffer = malloc(sizeof(VektorPrimitiveBuffer));
@@ -88,6 +100,14 @@ void vektor_appstate_new(VektorWidgetState* wstate, VektorAppState* stateOut) {
     // link all the buttons
     g_signal_connect(G_OBJECT(wstate->workspaceButtonLinetool), "clicked",
                      G_CALLBACK(appstate_set_tool), data_linetool);
+    g_signal_connect(G_OBJECT(wstate->workspaceButtonRecttool), "clicked",
+                     G_CALLBACK(appstate_set_tool), data_linetool);
+    g_signal_connect(G_OBJECT(wstate->workspaceButtonCircletool), "clicked",
+                     G_CALLBACK(appstate_set_tool), data_linetool);
+
+    // hook subtool revealers to their master buttons
+    g_signal_connect(G_OBJECT(wstate->workspaceButtonMasterShapes), "clicked",
+                    G_CALLBACK(appstate_reveal_subtools), wstate->workspaceRevealerShapes);
 
     // Add click gesture to canvas
     GtkGesture* canvasClickGesture = gtk_gesture_click_new();

src/ui/uicontroller.c

@@ -3,6 +3,7 @@
 #include "glib-object.h"
 #include "gtk/gtk.h"
 #include "gtk/gtkcssprovider.h"
+#include "gtk/gtkrevealer.h"
 
 void vektor_uictrl_init(GtkApplication* app, VektorWidgetState* stateOut) {
     GtkBuilder* builder = gtk_builder_new();
@@ -20,6 +21,13 @@ void vektor_uictrl_init(GtkApplication* app, VektorWidgetState* stateOut) {
         gdk_display_get_default(), GTK_STYLE_PROVIDER(provider),
         GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
+    // Load theme
+    gtk_icon_theme_add_search_path(
+        gtk_icon_theme_get_for_display(
+            gdk_display_get_default()
+        ), "icons"
+    );
+
     // populate state
     stateOut->window =
         GTK_WINDOW(gtk_builder_get_object(builder, "main_window"));
@@ -27,8 +35,18 @@ void vektor_uictrl_init(GtkApplication* app, VektorWidgetState* stateOut) {
         GTK_PANED(gtk_builder_get_object(builder, "workspace_paned"));
     stateOut->workspaceCanvas =
         GTK_GL_AREA(gtk_builder_get_object(builder, "workspace"));
+
+    stateOut->workspaceButtonMasterShapes =
+        GTK_BUTTON(gtk_builder_get_object(builder, "button_shapetools"));
+    stateOut->workspaceRevealerShapes =
+        GTK_REVEALER(gtk_builder_get_object(builder, "shape_revealer"));
     stateOut->workspaceButtonLinetool =
         GTK_BUTTON(gtk_builder_get_object(builder, "button_linetool"));
+    stateOut->workspaceButtonRecttool =
+        GTK_BUTTON(gtk_builder_get_object(builder, "button_rectangletool"));
+    stateOut->workspaceButtonCircletool =
+        GTK_BUTTON(gtk_builder_get_object(builder, "button_circletool"));
+    
 
     // Set window properties
     gtk_window_set_application(stateOut->window, app);
@@ -44,4 +62,6 @@ void vektor_uictrl_map(VektorWidgetState* state) {
     int window_width = gtk_widget_get_width(GTK_WIDGET(state->window));
     g_print("%i", window_width);
     gtk_paned_set_position(state->workspacePaned, 800 * .7);
+
+    
 }

src/ui/uicontroller.h

@@ -2,6 +2,7 @@
 #define VKTR_UICTRL_H
 
 #include "gtk/gtk.h"
+#include "gtk/gtkrevealer.h"
 
 /*
 Global application widget state, holding references to
@@ -12,7 +13,11 @@ typedef struct VektorWidgetState {
     GtkPaned* workspacePaned;
     GtkGLArea* workspaceCanvas;
 
+    GtkButton* workspaceButtonMasterShapes;
+    GtkRevealer* workspaceRevealerShapes;
     GtkButton* workspaceButtonLinetool;
+    GtkButton* workspaceButtonRecttool;
+    GtkButton* workspaceButtonCircletool;
 
     // GtkWidget* Workspace
 } VektorWidgetState;