diff options
| author | Alex Merry <alex.merry@cs.ox.ac.uk> | 2012-12-14 15:35:09 +0000 |
|---|---|---|
| committer | Alex Merry <alex.merry@cs.ox.ac.uk> | 2012-12-14 15:35:09 +0000 |
| commit | 3230de30f3e96158e54a7f9467264ebd6d6d0a65 (patch) | |
| tree | 7ee8fbd4c15516168ec2281a98b4d72cdbf85404 | |
| parent | 2ab14c0fb8dbf8850423fbb2e38a24ea881a8e49 (diff) | |
Add scrollbars to the tool style selectors
| -rw-r--r-- | tikzit/src/gtk/CreateEdgeTool.m | 12 | ||||
| -rw-r--r-- | tikzit/src/gtk/CreateNodeTool.m | 12 | ||||
| -rw-r--r-- | tikzit/src/gtk/ToolBox.m | 1 |
3 files changed, 21 insertions, 4 deletions
diff --git a/tikzit/src/gtk/CreateEdgeTool.m b/tikzit/src/gtk/CreateEdgeTool.m index b51e729..d8ca4b1 100644 --- a/tikzit/src/gtk/CreateEdgeTool.m +++ b/tikzit/src/gtk/CreateEdgeTool.m @@ -60,6 +60,15 @@ FALSE, 0); + GtkWidget *selWindow = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (selWindow); + gtk_container_add (GTK_CONTAINER (selWindow), + [stylePicker widget]); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selWindow), + GTK_POLICY_NEVER, + GTK_POLICY_AUTOMATIC); + gtk_widget_show ([stylePicker widget]); + GtkWidget *selectorFrame = gtk_frame_new (NULL); gtk_widget_show (selectorFrame); gtk_box_pack_start (GTK_BOX (configWidget), @@ -68,8 +77,7 @@ TRUE, 0); gtk_container_add (GTK_CONTAINER (selectorFrame), - [stylePicker widget]); - gtk_widget_show ([stylePicker widget]); + selWindow); } return self; diff --git a/tikzit/src/gtk/CreateNodeTool.m b/tikzit/src/gtk/CreateNodeTool.m index 5c8a884..a8402f0 100644 --- a/tikzit/src/gtk/CreateNodeTool.m +++ b/tikzit/src/gtk/CreateNodeTool.m @@ -60,6 +60,15 @@ FALSE, 0); + GtkWidget *selWindow = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (selWindow); + gtk_container_add (GTK_CONTAINER (selWindow), + [stylePicker widget]); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selWindow), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_widget_show ([stylePicker widget]); + GtkWidget *selectorFrame = gtk_frame_new (NULL); gtk_widget_show (selectorFrame); gtk_box_pack_start (GTK_BOX (configWidget), @@ -68,8 +77,7 @@ TRUE, 0); gtk_container_add (GTK_CONTAINER (selectorFrame), - [stylePicker widget]); - gtk_widget_show ([stylePicker widget]); + selWindow); } return self; diff --git a/tikzit/src/gtk/ToolBox.m b/tikzit/src/gtk/ToolBox.m index e5411c1..3fddacf 100644 --- a/tikzit/src/gtk/ToolBox.m +++ b/tikzit/src/gtk/ToolBox.m @@ -163,6 +163,7 @@ static void unretain (gpointer data); - (void) _setToolWidget:(GtkWidget*)widget { if (configWidget) { + gtk_widget_hide (configWidget); gtk_container_remove (GTK_CONTAINER (configWidgetContainer), configWidget); g_object_unref (configWidget); |