diff options
| -rw-r--r-- | SidebarManager.cpp | 2 | ||||
| -rw-r--r-- | SidebarToolbox.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/SidebarManager.cpp b/SidebarManager.cpp index 3e04016..b3bbaa7 100644 --- a/SidebarManager.cpp +++ b/SidebarManager.cpp @@ -10,7 +10,7 @@ SidebarManager::SidebarManager(EditManager *editor) sidebar = gtk_vbox_new(FALSE, 0); g_object_ref_sink(G_OBJECT(sidebar)); - gtk_box_pack_start_defaults(GTK_BOX(sidebar), sidebarToolbox.getWidget()); + gtk_box_pack_start(GTK_BOX(sidebar), sidebarToolbox.getWidget(), FALSE, FALSE, 0); scrolledWindow = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); diff --git a/SidebarToolbox.cpp b/SidebarToolbox.cpp index 8c8511d..a26417b 100644 --- a/SidebarToolbox.cpp +++ b/SidebarToolbox.cpp @@ -25,14 +25,12 @@ void SidebarToolbox::updateRows(bool changed) { this->cols = cols; this->rows = rows; - gtk_widget_set_size_request(widget, -1, rows*requisition.height); - for(std::map<Tool*, GtkWidget*>::iterator button = buttons.begin(); button != buttons.end(); button++) { if(gtk_widget_get_parent(button->second)) gtk_container_remove(GTK_CONTAINER(widget), button->second); } - gtk_table_resize(GTK_TABLE(widget), MAX(1, cols), MAX(1, rows)); + gtk_table_resize(GTK_TABLE(widget), MAX(1, rows), MAX(1, cols)); int iCol = 0, iRow = 0; for(std::list<Tool*>::iterator tool = tools.begin(); tool != tools.end(); tool++) { |