From edae2a8dc500b7af29928e5eb6dfc305726ce6e0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 16 Apr 2020 23:48:15 -0400 Subject: [PATCH] frame: Drop shadow-type Frames that don't draw frames are not very useful, so just drop the shadow-type property. --- demos/gtk-demo/colorsel.c | 1 - demos/gtk-demo/drawingarea.c | 2 - demos/gtk-demo/images.c | 5 -- demos/gtk-demo/listbox.ui | 2 - demos/gtk-demo/panes.c | 3 -- docs/reference/gtk/gtk4-sections.txt | 8 ++- docs/tools/widgets.c | 22 ++------ examples/drawing.c | 1 - gtk/gtkentrycompletion.c | 2 - gtk/gtkframe.c | 76 ++-------------------------- gtk/gtkframe.h | 6 --- gtk/gtkpaned.c | 2 - gtk/ui/gtkplacesview.ui | 1 - gtk/ui/gtkstatusbar.ui | 1 - tests/testcalendar.c | 1 - tests/testfilechooserbutton.c | 1 - tests/testflowbox.c | 1 - tests/testframe.c | 17 ------- tests/testgtk.c | 13 ----- 19 files changed, 10 insertions(+), 155 deletions(-) diff --git a/demos/gtk-demo/colorsel.c b/demos/gtk-demo/colorsel.c index 465cda3c4e..33ce704fd9 100644 --- a/demos/gtk-demo/colorsel.c +++ b/demos/gtk-demo/colorsel.c @@ -90,7 +90,6 @@ do_colorsel (GtkWidget *do_widget) */ frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_container_add (GTK_CONTAINER (vbox), frame); da = gtk_drawing_area_new (); diff --git a/demos/gtk-demo/drawingarea.c b/demos/gtk-demo/drawingarea.c index d16a417bc4..bbbe145524 100644 --- a/demos/gtk-demo/drawingarea.c +++ b/demos/gtk-demo/drawingarea.c @@ -214,7 +214,6 @@ do_drawingarea (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (vbox), label); frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_widget_set_vexpand (frame, TRUE); gtk_container_add (GTK_CONTAINER (vbox), frame); @@ -235,7 +234,6 @@ do_drawingarea (GtkWidget *do_widget) frame = gtk_frame_new (NULL); gtk_widget_set_vexpand (frame, TRUE); - gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_container_add (GTK_CONTAINER (vbox), frame); da = gtk_drawing_area_new (); diff --git a/demos/gtk-demo/images.c b/demos/gtk-demo/images.c index df0f81700a..3e476ce1b2 100644 --- a/demos/gtk-demo/images.c +++ b/demos/gtk-demo/images.c @@ -360,7 +360,6 @@ do_images (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (vbox), label); frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_widget_set_halign (frame, GTK_ALIGN_CENTER); gtk_widget_set_valign (frame, GTK_ALIGN_CENTER); gtk_container_add (GTK_CONTAINER (vbox), frame); @@ -379,7 +378,6 @@ do_images (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (vbox), label); frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_widget_set_halign (frame, GTK_ALIGN_CENTER); gtk_widget_set_valign (frame, GTK_ALIGN_CENTER); gtk_container_add (GTK_CONTAINER (vbox), frame); @@ -396,7 +394,6 @@ do_images (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (vbox), label); frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_widget_set_halign (frame, GTK_ALIGN_CENTER); gtk_widget_set_valign (frame, GTK_ALIGN_CENTER); gtk_container_add (GTK_CONTAINER (vbox), frame); @@ -418,7 +415,6 @@ do_images (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (vbox), label); frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_widget_set_halign (frame, GTK_ALIGN_CENTER); gtk_widget_set_valign (frame, GTK_ALIGN_CENTER); gtk_container_add (GTK_CONTAINER (vbox), frame); @@ -441,7 +437,6 @@ do_images (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (vbox), label); frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_widget_set_halign (frame, GTK_ALIGN_CENTER); gtk_widget_set_valign (frame, GTK_ALIGN_CENTER); gtk_container_add (GTK_CONTAINER (vbox), frame); diff --git a/demos/gtk-demo/listbox.ui b/demos/gtk-demo/listbox.ui index c6832f51b3..8588bf79e6 100644 --- a/demos/gtk-demo/listbox.ui +++ b/demos/gtk-demo/listbox.ui @@ -185,7 +185,6 @@ 8 - none <b>2</b> @@ -198,7 +197,6 @@ Reshares - none <b>2</b> diff --git a/demos/gtk-demo/panes.c b/demos/gtk-demo/panes.c index 73fbbe790c..9ed83509ee 100644 --- a/demos/gtk-demo/panes.c +++ b/demos/gtk-demo/panes.c @@ -172,7 +172,6 @@ do_panes (GtkWidget *do_widget) gtk_paned_add1 (GTK_PANED (vpaned), hpaned); frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN); gtk_widget_set_size_request (frame, 60, 60); gtk_paned_add1 (GTK_PANED (hpaned), frame); @@ -180,12 +179,10 @@ do_panes (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER(frame), button); frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN); gtk_widget_set_size_request (frame, 80, 60); gtk_paned_add2 (GTK_PANED (hpaned), frame); frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN); gtk_widget_set_size_request (frame, 60, 80); gtk_paned_add2 (GTK_PANED (vpaned), frame); diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index 594692736b..659b9eee31 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -1372,13 +1372,11 @@ GtkFrame GtkFrameClass gtk_frame_new gtk_frame_set_label -gtk_frame_set_label_widget -gtk_frame_set_label_align -gtk_frame_set_shadow_type gtk_frame_get_label -gtk_frame_get_label_align +gtk_frame_set_label_widget gtk_frame_get_label_widget -gtk_frame_get_shadow_type +gtk_frame_set_label_align +gtk_frame_get_label_align GTK_FRAME GTK_IS_FRAME diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c index 64b244680f..c6f088f47f 100644 --- a/docs/tools/widgets.c +++ b/docs/tools/widgets.c @@ -455,7 +455,6 @@ create_text_view (void) GtkWidget *text_view; widget = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (widget), GTK_SHADOW_IN); text_view = gtk_text_view_new (); gtk_container_add (GTK_CONTAINER (widget), text_view); /* Bad hack to add some size to the widget */ @@ -476,7 +475,6 @@ create_tree_view (void) WidgetInfo *info; widget = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (widget), GTK_SHADOW_IN); store = gtk_tree_store_new (3, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_STRING); gtk_tree_store_append (store, &iter, NULL); gtk_tree_store_set (store, &iter, 0, "Line One", 1, FALSE, 2, "A", -1); @@ -520,7 +518,6 @@ create_icon_view (void) WidgetInfo *info; widget = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (widget), GTK_SHADOW_IN); list_store = gtk_list_store_new (2, G_TYPE_STRING, GDK_TYPE_PIXBUF); gtk_list_store_append (list_store, &iter); pixbuf = gdk_pixbuf_new_from_file ("folder.png", NULL); @@ -665,27 +662,19 @@ create_panes (void) gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE); pane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); gtk_paned_pack1 (GTK_PANED (pane), - g_object_new (GTK_TYPE_FRAME, - "shadow-type", GTK_SHADOW_IN, - NULL), + g_object_new (GTK_TYPE_FRAME, NULL), FALSE, FALSE); gtk_paned_pack2 (GTK_PANED (pane), - g_object_new (GTK_TYPE_FRAME, - "shadow-type", GTK_SHADOW_IN, - NULL), + g_object_new (GTK_TYPE_FRAME, NULL), FALSE, FALSE); gtk_container_add (GTK_CONTAINER (hbox), pane); pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL); gtk_paned_pack1 (GTK_PANED (pane), - g_object_new (GTK_TYPE_FRAME, - "shadow-type", GTK_SHADOW_IN, - NULL), + g_object_new (GTK_TYPE_FRAME, NULL), FALSE, FALSE); gtk_paned_pack2 (GTK_PANED (pane), - g_object_new (GTK_TYPE_FRAME, - "shadow-type", GTK_SHADOW_IN, - NULL), + g_object_new (GTK_TYPE_FRAME, NULL), FALSE, FALSE); gtk_container_add (GTK_CONTAINER (hbox), pane); @@ -1259,7 +1248,6 @@ create_list_box (void) WidgetInfo *info; widget = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (widget), GTK_SHADOW_IN); list = gtk_list_box_new (); gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_BROWSE); @@ -1312,7 +1300,6 @@ create_flow_box (void) WidgetInfo *info; widget = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (widget), GTK_SHADOW_IN); box = gtk_flow_box_new (); gtk_flow_box_set_min_children_per_line (GTK_FLOW_BOX (box), 2); @@ -1351,7 +1338,6 @@ create_gl_area (void) GtkWidget *gears; widget = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (widget), GTK_SHADOW_IN); gears = gtk_gears_new (); gtk_container_add (GTK_CONTAINER (widget), gears); diff --git a/examples/drawing.c b/examples/drawing.c index f5315aebb7..37c439c904 100644 --- a/examples/drawing.c +++ b/examples/drawing.c @@ -143,7 +143,6 @@ activate (GtkApplication *app, g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL); frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_container_add (GTK_CONTAINER (window), frame); drawing_area = gtk_drawing_area_new (); diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index a7fc1f649d..0803dc6173 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -600,8 +600,6 @@ gtk_entry_completion_constructed (GObject *object) gtk_widget_add_controller (priv->popup_window, controller); popup_frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (popup_frame), - GTK_SHADOW_ETCHED_IN); gtk_container_add (GTK_CONTAINER (priv->popup_window), popup_frame); priv->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index 961c4a23b3..00d7333c55 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -71,7 +71,7 @@ * # CSS nodes * * |[ - * frame[.flat] + * frame * ├──