AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'matthiasc/for-master' into 'master'

Browse Source 
Matthiasc/for master

See merge request GNOME/gtk!1703
This commit is contained in:
Matthias Clasen 2020-04-17 16:23:29 +00:00
commit d4e53b14cb
80 changed files with 324 additions and 588 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demos/constraint-editor/constraint-editor-window.c
View File

@ -613,19 +613,19 @@ create_widget_func (gpointer item,
if (GTK_IS_CONSTRAINT (item) || GTK_IS_CONSTRAINT_GUIDE (item))
{
button = gtk_button_new_from_icon_name ("document-edit-symbolic");
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
g_signal_connect (button, "clicked", G_CALLBACK (row_edit), win);
g_object_set_data (G_OBJECT (row), "edit", button);
gtk_container_add (GTK_CONTAINER (box), button);
button = gtk_button_new_from_icon_name ("edit-delete-symbolic");
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
g_signal_connect (button, "clicked", G_CALLBACK (row_delete), win);
gtk_container_add (GTK_CONTAINER (box), button);
}
else if (GTK_IS_WIDGET (item))
{
button = gtk_button_new_from_icon_name ("edit-delete-symbolic");
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
g_signal_connect (button, "clicked", G_CALLBACK (row_delete), win);
gtk_container_add (GTK_CONTAINER (box), button);
}

2
demos/gtk-demo/application.ui
View File

@ -61,7 +61,7 @@
</child>
<child>
<object class="GtkScrolledWindow">
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<child>
<object class="GtkTextView">
<property name="hexpand">1</property>

2
demos/gtk-demo/blendmodes.ui
View File

@ -26,7 +26,7 @@
<child>
<object class="GtkScrolledWindow" id="scrolledwindow">
<property name="vexpand">1</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="min-content-width">150</property>
<layout>
<property name="left-attach">0</property>

1
demos/gtk-demo/colorsel.c
View File

@ -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 ();

2
demos/gtk-demo/demo.ui
View File

@ -166,7 +166,7 @@
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="hexpand">1</property>
<property name="vexpand">1</property>
<child>

2
demos/gtk-demo/demotaggedentry.c
View File

@ -472,7 +472,7 @@ demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *tag,
gtk_container_add (GTK_CONTAINER (tag->button), image);
gtk_widget_set_halign (tag->button, GTK_ALIGN_CENTER);
gtk_widget_set_valign (tag->button, GTK_ALIGN_CENTER);
gtk_button_set_relief (GTK_BUTTON (tag->button), GTK_RELIEF_NONE);
gtk_button_set_has_frame (GTK_BUTTON (tag->button), FALSE);
gtk_container_add (GTK_CONTAINER (tag->box), tag->button);
g_signal_connect (tag->button, "clicked", G_CALLBACK (on_button_clicked), tag);
}

14
demos/gtk-demo/dnd.c
View File

@ -279,11 +279,11 @@ pressed_cb (GtkGesture *gesture,
gtk_container_add (GTK_CONTAINER (menu), box);
item = gtk_button_new_with_label ("New Label");
gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
g_signal_connect (item, "clicked", G_CALLBACK (new_label_cb), widget);
gtk_container_add (GTK_CONTAINER (box), item);
item = gtk_button_new_with_label ("New Spinner");
gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
g_signal_connect (item, "clicked", G_CALLBACK (new_spinner_cb), widget);
gtk_container_add (GTK_CONTAINER (box), item);
@ -291,7 +291,7 @@ pressed_cb (GtkGesture *gesture,
gtk_container_add (GTK_CONTAINER (box), item);
item = gtk_button_new_with_label ("Edit");
gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
gtk_widget_set_sensitive (item, child != NULL && child != widget);
g_signal_connect (item, "clicked", G_CALLBACK (edit_cb), child);
gtk_container_add (GTK_CONTAINER (box), item);
@ -300,24 +300,24 @@ pressed_cb (GtkGesture *gesture,
gtk_container_add (GTK_CONTAINER (box), item);
item = gtk_button_new_with_label ("Cut");
gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
gtk_widget_set_sensitive (item, child != NULL && child != widget);
g_signal_connect (item, "clicked", G_CALLBACK (cut_cb), child);
gtk_container_add (GTK_CONTAINER (box), item);
item = gtk_button_new_with_label ("Copy");
gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
gtk_widget_set_sensitive (item, child != NULL && child != widget);
g_signal_connect (item, "clicked", G_CALLBACK (copy_cb), child);
gtk_container_add (GTK_CONTAINER (box), item);
item = gtk_button_new_with_label ("Paste");
gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
clipboard = gdk_display_get_clipboard (gdk_display_get_default ());
gtk_widget_set_sensitive (item,
gdk_content_formats_contain_gtype (gdk_clipboard_get_formats (clipboard), GTK_TYPE_DEMO_WIDGET));
g_signal_connect (item, "clicked", G_CALLBACK (paste_cb), widget);
gtk_container_add (GTK_CONTAINER (box), item);
item = gtk_button_new_with_label ("Delete");
gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
gtk_widget_set_sensitive (item, child != NULL && child != widget);
g_signal_connect (item, "clicked", G_CALLBACK (delete_cb), child);
gtk_container_add (GTK_CONTAINER (box), item);

2
demos/gtk-demo/drawingarea.c
View File

@ -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 ();

3
demos/gtk-demo/editable_cells.c
View File

@ -366,8 +366,7 @@ do_editable_cells (GtkWidget *do_widget)
gtk_label_new ("Shopping list (you can edit the cells!)"));
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);

2
demos/gtk-demo/expander.c
View File

@ -59,7 +59,7 @@ do_expander (GtkWidget *do_widget)
gtk_widget_set_vexpand (expander, TRUE);
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (sw), 100);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);

2
demos/gtk-demo/fishbowl.ui
View File

@ -49,7 +49,7 @@
<child type="end">
<object class="GtkToggleButton" id="changes_allow">
<property name="icon-name">changes-allow</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<signal name="notify::active" handler="fishbowl_changes_toggled_cb"/>
</object>
</child>

2
demos/gtk-demo/fontrendering.ui
View File

@ -193,7 +193,7 @@
<child>
<object class="GtkScrolledWindow">
<property name="propagate-natural-height">1</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="hexpand">1</property>
<property name="vexpand">1</property>
<child>

3
demos/gtk-demo/iconview.c
View File

@ -277,8 +277,7 @@ do_iconview (GtkWidget *do_widget)
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);

5
demos/gtk-demo/images.c
View File

@ -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);

3
demos/gtk-demo/list_store.c
View File

@ -272,8 +272,7 @@ do_list_store (GtkWidget *do_widget)
gtk_container_add (GTK_CONTAINER (vbox), label);
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);

18
demos/gtk-demo/listbox.ui
View File

@ -40,7 +40,7 @@
<object class="GtkButton" id="button2">
<property name="receives-default">1</property>
<property name="valign">baseline</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<child>
<object class="GtkLabel" id="source_name">
<property name="valign">baseline</property>
@ -109,7 +109,7 @@
<object class="GtkLinkButton" id="resent_by_button">
<property name="label" translatable="0">reshareer</property>
<property name="receives-default">1</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="uri">http://www.gtk.org</property>
</object>
</child>
@ -126,7 +126,7 @@
<object class="GtkButton" id="expand_button">
<property name="label" translatable="yes">Expand</property>
<property name="receives-default">1</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<signal name="clicked" handler="expand_clicked" swapped="yes"/>
</object>
</child>
@ -138,14 +138,14 @@
<object class="GtkButton" id="reply-button">
<property name="label" translatable="yes">Reply</property>
<property name="receives-default">1</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
</object>
</child>
<child>
<object class="GtkButton" id="reshare-button">
<property name="label" translatable="yes">Reshare</property>
<property name="receives-default">1</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<signal name="clicked" handler="reshare_clicked" swapped="yes"/>
</object>
</child>
@ -153,7 +153,7 @@
<object class="GtkButton" id="favorite-buttton">
<property name="label" translatable="yes">Favorite</property>
<property name="receives-default">1</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<signal name="clicked" handler="favorite_clicked" swapped="yes"/>
</object>
</child>
@ -161,7 +161,7 @@
<object class="GtkMenuButton" id="more-button">
<property name="receives-default">1</property>
<property name="menu-model">menu1</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="label" translatable="yes">More...</property>
</object>
</child>
@ -185,7 +185,6 @@
<property name="spacing">8</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="shadow-type">none</property>
<child>
<object class="GtkLabel" id="n_reshares_label">
<property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
@ -198,7 +197,6 @@ Reshares</property>
</child>
<child>
<object class="GtkFrame" id="frame2">
<property name="shadow-type">none</property>
<child>
<object class="GtkLabel" id="n_favorites_label">
<property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
@ -225,7 +223,7 @@ FAVORITES</property>
<object class="GtkButton" id="button5">
<property name="label" translatable="yes">Details</property>
<property name="receives-default">1</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<style>
<class name="dim-label"/>
</style>

2
demos/gtk-demo/main.c
View File

@ -612,8 +612,6 @@ display_text (const char *resource)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
GTK_SHADOW_NONE);
gtk_container_add (GTK_CONTAINER (sw), textview);
return sw;

3
demos/gtk-demo/panes.c
View File

@ -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);

3
demos/gtk-demo/tree_store.c
View File

@ -408,8 +408,7 @@ do_tree_store (GtkWidget *do_widget)
gtk_label_new ("Jonathan's Holiday Card Planning Sheet"));
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);

28
demos/widget-factory/widget-factory.ui
View File

@ -864,7 +864,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<property name="label" translatable="yes">link button</property>
<property name="receives-default">1</property>
<property name="has-tooltip">1</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="uri">http://www.gtk.org</property>
</object>
</child>
@ -1113,7 +1113,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="width-request">150</property>
<property name="vscrollbar-policy">always</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="vexpand">1</property>
<child>
<object class="GtkTreeView" id="treeview1">
@ -1187,7 +1187,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="vexpand">1</property>
<child>
<object class="GtkTextView" id="textview1">
@ -1449,7 +1449,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<child>
<object class="GtkButton" id="page2dismiss">
<property name="focus-on-click">0</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="icon-name">window-close-symbolic</property>
</object>
</child>
@ -1597,7 +1597,7 @@ microphone-sensitivity-medium-symbolic</property>
</child>
<child>
<object class="GtkScrolledWindow">
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="hscrollbar-policy">never</property>
<property name="min-content-height">200</property>
<property name="hexpand">0</property>
@ -1999,7 +1999,7 @@ microphone-sensitivity-medium-symbolic</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow3">
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="margin-top">6</property>
<property name="height-request">226</property>
<child>
@ -2105,7 +2105,7 @@ microphone-sensitivity-medium-symbolic</property>
<property name="hscrollbar-policy">never</property>
<property name="vscrollbar-policy">always</property>
<property name="height-request">300</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<child>
<object class="GtkTreeView" id="charletree">
<property name="enable-grid-lines">vertical</property>
@ -2171,7 +2171,7 @@ microphone-sensitivity-medium-symbolic</property>
<object class="GtkScrolledWindow">
<property name="hscrollbar-policy">never</property>
<property name="vexpand">1</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<child>
<object class="GtkListBox" id="munsell">
<property name="selection-mode">multiple</property>
@ -2639,7 +2639,7 @@ microphone-sensitivity-medium-symbolic</property>
<property name="valign">center</property>
<property name="popover">notebook_info_popover2</property>
<property name="icon-name">emblem-important-symbolic</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<style>
<class name="circular"/>
</style>
@ -2664,7 +2664,7 @@ microphone-sensitivity-medium-symbolic</property>
</child>
<child>
<object class="GtkButton">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="focus-on-click">0</property>
<property name="icon-name">window-close-symbolic</property>
<signal name="clicked" handler="tab_close_cb" object="closable_page_1"/>
@ -2696,7 +2696,7 @@ microphone-sensitivity-medium-symbolic</property>
</child>
<child>
<object class="GtkButton">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="focus-on-click">0</property>
<property name="icon-name">window-close-symbolic</property>
<signal name="clicked" handler="tab_close_cb" object="closable_page_2"/>
@ -2783,7 +2783,7 @@ microphone-sensitivity-medium-symbolic</property>
<property name="valign">center</property>
<property name="popover">notebook_info_popover</property>
<property name="icon-name">emblem-important-symbolic</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<style>
<class name="circular"/>
</style>
@ -3141,7 +3141,7 @@ bad things might happen.</property>
<child>
<object class="GtkScrolledWindow">
<property name="valign">start</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="min-content-height">70</property>
<property name="max-content-height">120</property>
<property name="min-content-width">100</property>
@ -3275,7 +3275,7 @@ bad things might happen.</property>
<property name="valign">center</property>
<property name="popover">notebook_info_popover3</property>
<property name="icon-name">emblem-important-symbolic</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<style>
<class name="circular"/>
</style>

24
docs/reference/gtk/gtk4-sections.txt
View File

@ -520,8 +520,8 @@ gtk_button_new
gtk_button_new_with_label
gtk_button_new_with_mnemonic
gtk_button_new_from_icon_name
gtk_button_set_relief
gtk_button_get_relief
gtk_button_set_has_frame
gtk_button_get_has_frame
gtk_button_get_label
gtk_button_set_label
gtk_button_get_use_underline
@ -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
<SUBSECTION Standard>
GTK_FRAME
GTK_IS_FRAME
@ -1712,8 +1710,8 @@ gtk_menu_button_set_icon_name
gtk_menu_button_get_icon_name
gtk_menu_button_set_label
gtk_menu_button_get_label
gtk_menu_button_set_relief
gtk_menu_button_get_relief
gtk_menu_button_set_has_frame
gtk_menu_button_get_has_frame
gtk_menu_button_popup
gtk_menu_button_popdown
GtkMenuButtonCreatePopupFunc
@ -2205,8 +2203,8 @@ GtkCornerType
gtk_scrolled_window_get_placement
gtk_scrolled_window_set_placement
gtk_scrolled_window_unset_placement
gtk_scrolled_window_get_shadow_type
gtk_scrolled_window_set_shadow_type
gtk_scrolled_window_get_has_frame
gtk_scrolled_window_set_has_frame
gtk_scrolled_window_get_kinetic_scrolling
gtk_scrolled_window_set_kinetic_scrolling
gtk_scrolled_window_get_capture_button_press
@ -3843,8 +3841,6 @@ gtk_list_store_get_type
<TITLE>GtkViewport</TITLE>
GtkViewport
gtk_viewport_new
gtk_viewport_set_shadow_type
gtk_viewport_get_shadow_type
<SUBSECTION Standard>
GTK_VIEWPORT
GTK_IS_VIEWPORT
@ -4538,11 +4534,9 @@ GtkMovementStep
GtkOrientation
GtkPackType
GtkPositionType
GtkReliefStyle
GtkScrollStep
GtkScrollType
GtkSelectionMode
GtkShadowType
GtkStateFlags
GtkSortType
GtkIconSize

22
docs/tools/widgets.c
View File

@ -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);

1
examples/drawing.c
View File

@ -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 ();

75
gtk/gtkbutton.c
View File

@ -102,7 +102,7 @@ enum {
enum {
PROP_0,
PROP_LABEL,
PROP_RELIEF,
PROP_HAS_FRAME,
PROP_USE_UNDERLINE,
PROP_ICON_NAME,
@ -228,13 +228,12 @@ gtk_button_class_init (GtkButtonClass *klass)
FALSE,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
props[PROP_RELIEF] =
g_param_spec_enum ("relief",
P_("Border relief"),
P_("The border relief style"),
GTK_TYPE_RELIEF_STYLE,
GTK_RELIEF_NORMAL,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
props[PROP_HAS_FRAME] =
g_param_spec_boolean ("has-frame",
P_("Has Frame"),
P_("Whether the button has a frame"),
TRUE,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
props[PROP_ICON_NAME] =
g_param_spec_string ("icon-name",
@ -484,8 +483,8 @@ gtk_button_set_property (GObject *object,
case PROP_LABEL:
gtk_button_set_label (button, g_value_get_string (value));
break;
case PROP_RELIEF:
gtk_button_set_relief (button, g_value_get_enum (value));
case PROP_HAS_FRAME:
gtk_button_set_has_frame (button, g_value_get_boolean (value));
break;
case PROP_USE_UNDERLINE:
gtk_button_set_use_underline (button, g_value_get_boolean (value));
@ -519,8 +518,8 @@ gtk_button_get_property (GObject *object,
case PROP_LABEL:
g_value_set_string (value, gtk_button_get_label (button));
break;
case PROP_RELIEF:
g_value_set_enum (value, gtk_button_get_relief (button));
case PROP_HAS_FRAME:
g_value_set_boolean (value, gtk_button_get_has_frame (button));
break;
case PROP_USE_UNDERLINE:
g_value_set_boolean (value, priv->use_underline);
@ -641,51 +640,45 @@ gtk_button_new_with_mnemonic (const gchar *label)
}
/**
* gtk_button_set_relief:
* @button: The #GtkButton you want to set relief styles of
* @relief: The GtkReliefStyle as described above
* gtk_Button_set_has_frame:
* @button: a #GtkButton
* @has_frame: whether the button should have a visible frame
*
* Sets the relief style of the edges of the given #GtkButton widget.
* Two styles exist, %GTK_RELIEF_NORMAL and %GTK_RELIEF_NONE.
* The default style is, as one can guess, %GTK_RELIEF_NORMAL.
* Sets the style of the button. Buttons can has a flat appearance
* or have a frame drawn around them.
*/
void
gtk_button_set_relief (GtkButton *button,
GtkReliefStyle relief)
gtk_button_set_has_frame (GtkButton *button,
gboolean has_frame)
{
GtkReliefStyle old_relief;
g_return_if_fail (GTK_IS_BUTTON (button));
old_relief = gtk_button_get_relief (button);
if (old_relief != relief)
{
if (relief == GTK_RELIEF_NONE)
gtk_widget_add_css_class (GTK_WIDGET (button), GTK_STYLE_CLASS_FLAT);
else
gtk_widget_remove_css_class (GTK_WIDGET (button), GTK_STYLE_CLASS_FLAT);
if (gtk_button_get_has_frame (button) == has_frame)
return;
g_object_notify_by_pspec (G_OBJECT (button), props[PROP_RELIEF]);
}
if (has_frame)
gtk_widget_remove_css_class (GTK_WIDGET (button), GTK_STYLE_CLASS_FLAT);
else
gtk_widget_add_css_class (GTK_WIDGET (button), GTK_STYLE_CLASS_FLAT);
g_object_notify_by_pspec (G_OBJECT (button), props[PROP_HAS_FRAME]);
}
/**
* gtk_button_get_relief:
* @button: The #GtkButton you want the #GtkReliefStyle from.
* gtk_button_get_has_frame:
* @button: a #GtkButton
*
* Returns the current relief style of the given #GtkButton.
* Returns whether the button has a frame.
*
* Returns: The current #GtkReliefStyle
* Returns: %TRUE if the button has a frame
*/
GtkReliefStyle
gtk_button_get_relief (GtkButton *button)
gboolean
gtk_button_get_has_frame (GtkButton *button)
{
g_return_val_if_fail (GTK_IS_BUTTON (button), GTK_RELIEF_NORMAL);
g_return_val_if_fail (GTK_IS_BUTTON (button), TRUE);
if (gtk_widget_has_css_class (GTK_WIDGET (button), GTK_STYLE_CLASS_FLAT))
return GTK_RELIEF_NONE;
else
return GTK_RELIEF_NORMAL;
return !gtk_widget_has_css_class (GTK_WIDGET (button), GTK_STYLE_CLASS_FLAT);
}
static void

6
gtk/gtkbutton.h
View File

@ -86,10 +86,10 @@ GDK_AVAILABLE_IN_ALL
GtkWidget* gtk_button_new_with_mnemonic (const gchar *label);
GDK_AVAILABLE_IN_ALL
void gtk_button_set_relief (GtkButton *button,
GtkReliefStyle relief);
void gtk_button_set_has_frame (GtkButton *button,
gboolean has_frame);
GDK_AVAILABLE_IN_ALL
GtkReliefStyle gtk_button_get_relief (GtkButton *button);
gboolean gtk_button_get_has_frame (GtkButton *button);
GDK_AVAILABLE_IN_ALL
void gtk_button_set_label (GtkButton *button,
const gchar *label);

68
gtk/gtkcalendar.c
View File

@ -1181,13 +1181,31 @@ gtk_calendar_scroll_controller_scroll (GtkEventControllerScroll *scroll,
static void
move_focus (GtkCalendar *calendar,
gint direction)
int direction,
int updown)
{
GtkCalendarPrivate *priv = gtk_calendar_get_instance_private (calendar);
GtkTextDirection text_dir = gtk_widget_get_direction (GTK_WIDGET (calendar));
int x, y;
if ((text_dir == GTK_TEXT_DIR_LTR && direction == -1) ||
(text_dir == GTK_TEXT_DIR_RTL && direction == 1))
if (updown == 1)
{
if (priv->focus_row > 0)
priv->focus_row--;
if (priv->focus_row < 0)
priv->focus_row = 5;
if (priv->focus_col < 0)
priv->focus_col = 6;
}
else if (updown == -1)
{
if (priv->focus_row < 5)
priv->focus_row++;
if (priv->focus_col < 0)
priv->focus_col = 0;
}
else if ((text_dir == GTK_TEXT_DIR_LTR && direction == -1) ||
(text_dir == GTK_TEXT_DIR_RTL && direction == 1))
{
if (priv->focus_col > 0)
priv->focus_col--;
@ -1217,6 +1235,17 @@ move_focus (GtkCalendar *calendar,
if (priv->focus_row < 0)
priv->focus_row = 0;
}
for (y = 0; y < 6; y ++)
for (x = 0; x < 7; x ++)
{
GtkWidget *label = priv->day_number_labels[y][x];
if (priv->focus_row == y && priv->focus_col == x)
gtk_widget_set_state_flags (label, GTK_STATE_FLAG_FOCUSED, FALSE);
else
gtk_widget_unset_state_flags (label, GTK_STATE_FLAG_FOCUSED);
}
}
static gboolean
@ -1247,10 +1276,9 @@ gtk_calendar_key_controller_key_pressed (GtkEventControllerKey *controller,
calendar_set_month_prev (calendar);
else
{
move_focus (calendar, -1);
move_focus (calendar, -1, 0);
calendar_invalidate_day (calendar, old_focus_row, old_focus_col);
calendar_invalidate_day (calendar, priv->focus_row,
priv->focus_col);
calendar_invalidate_day (calendar, priv->focus_row, priv->focus_col);
}
break;
case GDK_KEY_KP_Right:
@ -1260,10 +1288,9 @@ gtk_calendar_key_controller_key_pressed (GtkEventControllerKey *controller,
calendar_set_month_next (calendar);
else
{
move_focus (calendar, 1);
move_focus (calendar, 1, 0);
calendar_invalidate_day (calendar, old_focus_row, old_focus_col);
calendar_invalidate_day (calendar, priv->focus_row,
priv->focus_col);
calendar_invalidate_day (calendar, priv->focus_row, priv->focus_col);
}
break;
case GDK_KEY_KP_Up:
@ -1273,15 +1300,9 @@ gtk_calendar_key_controller_key_pressed (GtkEventControllerKey *controller,
calendar_set_year_prev (calendar);
else
{
if (priv->focus_row > 0)
priv->focus_row--;
if (priv->focus_row < 0)
priv->focus_row = 5;
if (priv->focus_col < 0)
priv->focus_col = 6;
move_focus (calendar, 0, 1);
calendar_invalidate_day (calendar, old_focus_row, old_focus_col);
calendar_invalidate_day (calendar, priv->focus_row,
priv->focus_col);
calendar_invalidate_day (calendar, priv->focus_row, priv->focus_col);
}
break;
case GDK_KEY_KP_Down:
@ -1291,13 +1312,9 @@ gtk_calendar_key_controller_key_pressed (GtkEventControllerKey *controller,
calendar_set_year_next (calendar);
else
{
if (priv->focus_row < 5)
priv->focus_row++;
if (priv->focus_col < 0)
priv->focus_col = 0;
move_focus (calendar, 0, -1);
calendar_invalidate_day (calendar, old_focus_row, old_focus_col);
calendar_invalidate_day (calendar, priv->focus_row,
priv->focus_col);
calendar_invalidate_day (calendar, priv->focus_row, priv->focus_col);
}
break;
case GDK_KEY_KP_Space:
@ -1460,6 +1477,11 @@ gtk_calendar_select_day (GtkCalendar *self,
else
gtk_widget_unset_state_flags (label, GTK_STATE_FLAG_SELECTED);
if (priv->focus_row == y && priv->focus_col == x)
gtk_widget_set_state_flags (label, GTK_STATE_FLAG_FOCUSED, FALSE);
else
gtk_widget_unset_state_flags (label, GTK_STATE_FLAG_FOCUSED);
if (day == today_day &&
priv->day_month[y][x] == MONTH_CURRENT)
gtk_widget_add_css_class (label, "today");

3
gtk/gtkcustompaperunixdialog.c
View File

@ -1022,8 +1022,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
scrolled = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled),
GTK_SHADOW_IN);
gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled), TRUE);
gtk_container_add (GTK_CONTAINER (vbox), scrolled);
gtk_widget_show (scrolled);

4
gtk/gtkentrycompletion.c
View File

@ -548,8 +548,6 @@ gtk_entry_completion_constructed (GObject *object)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scrolled_window),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->scrolled_window),
GTK_SHADOW_NONE);
/* a nasty hack to get the completions treeview to size nicely */
gtk_widget_set_size_request (gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (priv->scrolled_window)),
@ -602,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);

36
gtk/gtkenums.h
View File

@ -391,19 +391,6 @@ typedef enum
GTK_POS_BOTTOM
} GtkPositionType;
/**
* GtkReliefStyle:
* @GTK_RELIEF_NORMAL: Draw a normal relief.
* @GTK_RELIEF_NONE: No relief.
*
* Indicated the relief to be drawn around a #GtkButton.
*/
typedef enum
{
GTK_RELIEF_NORMAL,
GTK_RELIEF_NONE
} GtkReliefStyle;
/**
* GtkScrollType:
* @GTK_SCROLL_NONE: No scrolling.
@ -470,29 +457,6 @@ typedef enum
GTK_SELECTION_MULTIPLE
} GtkSelectionMode;
/**
* GtkShadowType:
* @GTK_SHADOW_NONE: No outline.
* @GTK_SHADOW_IN: The outline is bevelled inwards.
* @GTK_SHADOW_OUT: The outline is bevelled outwards like a button.
* @GTK_SHADOW_ETCHED_IN: The outline has a sunken 3d appearance.
* @GTK_SHADOW_ETCHED_OUT: The outline has a raised 3d appearance.
*
* Used to change the appearance of an outline typically provided by a #GtkFrame.
*
* Note that many themes do not differentiate the appearance of the
* various shadow types: Either there is no visible shadow (@GTK_SHADOW_NONE),
* or there is (any other value).
*/
typedef enum
{
GTK_SHADOW_NONE,
GTK_SHADOW_IN,
GTK_SHADOW_OUT,
GTK_SHADOW_ETCHED_IN,
GTK_SHADOW_ETCHED_OUT
} GtkShadowType;
/* Widget states */
/**

76
gtk/gtkframe.c
View File

@ -71,7 +71,7 @@
* # CSS nodes
*
* |[<!-- language="plain" -->
* frame[.flat]
* frame
* ├── <label widget>
* ╰── <child>
* ]|
@ -79,11 +79,6 @@
* GtkFrame has a main CSS node with name “frame”, which is used to draw the
* visible border. You can set the appearance of the border using CSS properties
* like “border-style” on this node.
*
* The node can be given the style class “.flat”, which is used by themes to
* disable drawing of the border. To do this from code, call
* gtk_frame_set_shadow_type() with %GTK_SHADOW_NONE to add the “.flat” class or
* any other shadow type to remove it.
*/
typedef struct
@ -91,7 +86,7 @@ typedef struct
/* Properties */
GtkWidget *label_widget;
gint16 shadow_type;
guint has_frame : 1;
gfloat label_xalign;
} GtkFramePrivate;
@ -99,7 +94,6 @@ enum {
PROP_0,
PROP_LABEL,
PROP_LABEL_XALIGN,
PROP_SHADOW_TYPE,
PROP_LABEL_WIDGET,
LAST_PROP
};
@ -177,14 +171,6 @@ gtk_frame_class_init (GtkFrameClass *class)
0.0,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
frame_props[PROP_SHADOW_TYPE] =
g_param_spec_enum ("shadow-type",
P_("Frame shadow"),
P_("Appearance of the frame"),
GTK_TYPE_SHADOW_TYPE,
GTK_SHADOW_ETCHED_IN,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
frame_props[PROP_LABEL_WIDGET] =
g_param_spec_object ("label-widget",
P_("Label widget"),
@ -234,7 +220,7 @@ gtk_frame_init (GtkFrame *frame)
GtkFramePrivate *priv = gtk_frame_get_instance_private (frame);
priv->label_widget = NULL;
priv->shadow_type = GTK_SHADOW_ETCHED_IN;
priv->has_frame = TRUE;
priv->label_xalign = 0.0;
}
@ -254,9 +240,6 @@ gtk_frame_set_property (GObject *object,
case PROP_LABEL_XALIGN:
gtk_frame_set_label_align (frame, g_value_get_float (value));
break;
case PROP_SHADOW_TYPE:
gtk_frame_set_shadow_type (frame, g_value_get_enum (value));
break;
case PROP_LABEL_WIDGET:
gtk_frame_set_label_widget (frame, g_value_get_object (value));
break;
@ -283,9 +266,6 @@ gtk_frame_get_property (GObject *object,
case PROP_LABEL_XALIGN:
g_value_set_float (value, priv->label_xalign);
break;
case PROP_SHADOW_TYPE:
g_value_set_enum (value, priv->shadow_type);
break;
case PROP_LABEL_WIDGET:
g_value_set_object (value,
priv->label_widget ?
@ -511,56 +491,6 @@ gtk_frame_get_label_align (GtkFrame *frame)
return priv->label_xalign;
}
/**
* gtk_frame_set_shadow_type:
* @frame: a #GtkFrame
* @type: the new #GtkShadowType
*
* Sets the #GtkFrame:shadow-type for @frame, i.e. whether it is drawn without
* (%GTK_SHADOW_NONE) or with (other values) a visible border. Values other than
* %GTK_SHADOW_NONE are treated identically by GtkFrame. The chosen type is
* applied by removing or adding the .flat class to the main CSS node, frame.
**/
void
gtk_frame_set_shadow_type (GtkFrame *frame,
GtkShadowType type)
{
GtkFramePrivate *priv = gtk_frame_get_instance_private (frame);
g_return_if_fail (GTK_IS_FRAME (frame));
if ((GtkShadowType) priv->shadow_type != type)
{
priv->shadow_type = type;
if (type == GTK_SHADOW_NONE)
gtk_widget_add_css_class (GTK_WIDGET (frame), "flat");
else
gtk_widget_remove_css_class (GTK_WIDGET (frame), "flat");
g_object_notify_by_pspec (G_OBJECT (frame), frame_props[PROP_SHADOW_TYPE]);
}
}
/**
* gtk_frame_get_shadow_type:
* @frame: a #GtkFrame
*
* Retrieves the shadow type of the frame. See
* gtk_frame_set_shadow_type().
*
* Returns: the current shadow type of the frame.
**/
GtkShadowType
gtk_frame_get_shadow_type (GtkFrame *frame)
{
GtkFramePrivate *priv = gtk_frame_get_instance_private (frame);
g_return_val_if_fail (GTK_IS_FRAME (frame), GTK_SHADOW_ETCHED_IN);
return priv->shadow_type;
}
static void
gtk_frame_size_allocate (GtkWidget *widget,
int width,

6
gtk/gtkframe.h
View File

@ -92,12 +92,6 @@ void gtk_frame_set_label_align (GtkFrame *frame,
gfloat xalign);
GDK_AVAILABLE_IN_ALL
gfloat gtk_frame_get_label_align (GtkFrame *frame);
GDK_AVAILABLE_IN_ALL
void gtk_frame_set_shadow_type (GtkFrame *frame,
GtkShadowType type);
GDK_AVAILABLE_IN_ALL
GtkShadowType gtk_frame_get_shadow_type (GtkFrame *frame);
G_END_DECLS

2
gtk/gtklinkbutton.c
View File

@ -345,7 +345,7 @@ gtk_link_button_init (GtkLinkButton *link_button)
GdkContentProvider *content;
GtkDragSource *source;
gtk_button_set_relief (GTK_BUTTON (link_button), GTK_RELIEF_NONE);
gtk_button_set_has_frame (GTK_BUTTON (link_button), FALSE);
gtk_widget_set_state_flags (GTK_WIDGET (link_button), GTK_STATE_FLAG_LINK, FALSE);
gtk_widget_set_has_tooltip (GTK_WIDGET (link_button), TRUE);

61
gtk/gtkmenubutton.c
View File

@ -166,7 +166,7 @@ enum
PROP_ICON_NAME,
PROP_LABEL,
PROP_USE_UNDERLINE,
PROP_RELIEF,
PROP_HAS_FRAME,
LAST_PROP
};
@ -207,8 +207,8 @@ gtk_menu_button_set_property (GObject *object,
case PROP_USE_UNDERLINE:
gtk_menu_button_set_use_underline (self, g_value_get_boolean (value));
break;
case PROP_RELIEF:
gtk_menu_button_set_relief (self, g_value_get_enum (value));
case PROP_HAS_FRAME:
gtk_menu_button_set_has_frame (self, g_value_get_boolean (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@ -246,8 +246,8 @@ gtk_menu_button_get_property (GObject *object,
case PROP_USE_UNDERLINE:
g_value_set_boolean (value, gtk_menu_button_get_use_underline (GTK_MENU_BUTTON (object)));
break;
case PROP_RELIEF:
g_value_set_enum (value, gtk_menu_button_get_relief (GTK_MENU_BUTTON (object)));
case PROP_HAS_FRAME:
g_value_set_boolean (value, gtk_menu_button_get_has_frame (GTK_MENU_BUTTON (object)));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@ -431,13 +431,12 @@ gtk_menu_button_class_init (GtkMenuButtonClass *klass)
FALSE,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
menu_button_props[PROP_RELIEF] =
g_param_spec_enum ("relief",
P_("Border relief"),
P_("The border relief style"),
GTK_TYPE_RELIEF_STYLE,
GTK_RELIEF_NORMAL,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
menu_button_props[PROP_HAS_FRAME] =
g_param_spec_boolean ("has-frame",
P_("Has frame"),
P_("Whether the button has a frame"),
TRUE,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
g_object_class_install_properties (gobject_class, LAST_PROP, menu_button_props);
@ -932,43 +931,39 @@ gtk_menu_button_get_label (GtkMenuButton *menu_button)
}
/**
* gtk_menu_button_set_relief:
* @menu_button: The #GtkMenuButton you want to set relief styles of
* @relief: The GtkReliefStyle as described above
* gtk_menu_button_set_has_frame:
* @menu_button: a #GtkMenuButton
* @has_frame: whether the button should have a visible frame
*
* Sets the relief style of the edges of the given
* #GtkMenuButton widget.
*
* Two styles exist, %GTK_RELIEF_NORMAL and %GTK_RELIEF_NONE.
* The default style is, as one can guess, %GTK_RELIEF_NORMAL.
* Sets the style of the button.
*/
void
gtk_menu_button_set_relief (GtkMenuButton *menu_button,
GtkReliefStyle relief)
gtk_menu_button_set_has_frame (GtkMenuButton *menu_button,
gboolean has_frame)
{
g_return_if_fail (GTK_IS_MENU_BUTTON (menu_button));
if (relief == gtk_button_get_relief (GTK_BUTTON (menu_button->button)))
if (gtk_button_get_has_frame (GTK_BUTTON (menu_button->button)) == has_frame)
return;
gtk_button_set_relief (GTK_BUTTON (menu_button->button), relief);
g_object_notify_by_pspec (G_OBJECT (menu_button), menu_button_props[PROP_RELIEF]);
gtk_button_set_has_frame (GTK_BUTTON (menu_button->button), has_frame);
g_object_notify_by_pspec (G_OBJECT (menu_button), menu_button_props[PROP_HAS_FRAME]);
}
/**
* gtk_menu_button_get_relief:
* @menu_button: The #GtkMenuButton you want the #GtkReliefStyle from.
* gtk_menu_button_get_has_frame:
* @menu_button: a #GtkMenuButton
*
* Returns the current relief style of the given #GtkMenuButton.
* Returns whether the button has a frame.
*
* Returns: The current #GtkReliefStyle
* Returns: %TRUE if the button has a frame
*/
GtkReliefStyle
gtk_menu_button_get_relief (GtkMenuButton *menu_button)
gboolean
gtk_menu_button_get_has_frame (GtkMenuButton *menu_button)
{
g_return_val_if_fail (GTK_IS_MENU_BUTTON (menu_button), GTK_RELIEF_NORMAL);
g_return_val_if_fail (GTK_IS_MENU_BUTTON (menu_button), TRUE);
return gtk_button_get_relief (GTK_BUTTON (menu_button->button));
return gtk_button_get_has_frame (GTK_BUTTON (menu_button->button));
}
/**

6
gtk/gtkmenubutton.h
View File

@ -96,10 +96,10 @@ GDK_AVAILABLE_IN_ALL
gboolean gtk_menu_button_get_use_underline (GtkMenuButton *menu_button);
GDK_AVAILABLE_IN_ALL
void gtk_menu_button_set_relief (GtkMenuButton *menu_button,
GtkReliefStyle relief);
void gtk_menu_button_set_has_frame (GtkMenuButton *menu_button,
gboolean has_frame);
GDK_AVAILABLE_IN_ALL
GtkReliefStyle gtk_menu_button_get_relief (GtkMenuButton *menu_button);
gboolean gtk_menu_button_get_has_frame (GtkMenuButton *menu_button);
GDK_AVAILABLE_IN_ALL
void gtk_menu_button_popup (GtkMenuButton *menu_button);

2
gtk/gtkmountoperation.c
View File

@ -1592,7 +1592,7 @@ create_show_processes_dialog (GtkMountOperation *op,
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window), TRUE);
gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
gtk_container_add (GTK_CONTAINER (vbox), scrolled_window);

2
gtk/gtknotebook.c
View File

@ -5545,7 +5545,7 @@ gtk_notebook_menu_item_create (GtkNotebook *notebook,
}
menu_item = gtk_button_new ();
gtk_button_set_relief (GTK_BUTTON (menu_item), GTK_RELIEF_NONE);
gtk_button_set_has_frame (GTK_BUTTON (menu_item), FALSE);
gtk_container_add (GTK_CONTAINER (menu_item), page->menu_label);
gtk_container_add (GTK_CONTAINER (notebook->menu_box), menu_item);
g_signal_connect (menu_item, "clicked",

2
gtk/gtkpaned.c
View File

@ -106,8 +106,6 @@
* GtkWidget *hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
* GtkWidget *frame1 = gtk_frame_new (NULL);
* GtkWidget *frame2 = gtk_frame_new (NULL);
* gtk_frame_set_shadow_type (GTK_FRAME (frame1), GTK_SHADOW_IN);
* gtk_frame_set_shadow_type (GTK_FRAME (frame2), GTK_SHADOW_IN);
*
* gtk_widget_set_size_request (hpaned, 200, -1);
*

2
gtk/gtkplacessidebar.c
View File

@ -3768,7 +3768,7 @@ gtk_places_sidebar_init (GtkPlacesSidebar *sidebar)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sidebar->swin),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sidebar->swin), GTK_SHADOW_IN);
gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sidebar->swin), TRUE);
gtk_widget_add_css_class (GTK_WIDGET (sidebar), "sidebar");

2
gtk/gtkplacesview.c
View File

@ -610,7 +610,7 @@ populate_servers (GtkPlacesView *view)
button = gtk_button_new_from_icon_name ("window-close-symbolic");
gtk_widget_set_halign (button, GTK_ALIGN_END);
gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
gtk_widget_add_css_class (button, "sidebar-button");
gtk_grid_attach (GTK_GRID (grid), button, 1, 0, 1, 2);

76
gtk/gtkscrolledwindow.c
View File

@ -128,6 +128,8 @@
* # CSS nodes
*
* GtkScrolledWindow has a main CSS node with name scrolledwindow.
* It gets a .frame style class added when #GtkScrolledWindow:has-frame
* is %TRUE.
*
* It uses subnodes with names overshoot and undershoot to
* draw the overflow and underflow indications. These nodes get
@ -246,8 +248,7 @@ typedef struct
Indicator vindicator;
GtkCornerType window_placement;
guint16 shadow_type;
guint has_frame : 1;
guint hscrollbar_policy : 2;
guint vscrollbar_policy : 2;
guint hscrollbar_visible : 1;
@ -307,7 +308,7 @@ enum {
PROP_HSCROLLBAR_POLICY,
PROP_VSCROLLBAR_POLICY,
PROP_WINDOW_PLACEMENT,
PROP_SHADOW_TYPE,
PROP_HAS_FRAME,
PROP_MIN_CONTENT_WIDTH,
PROP_MIN_CONTENT_HEIGHT,
PROP_KINETIC_SCROLLING,
@ -578,13 +579,12 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
GTK_CORNER_TOP_LEFT,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
properties[PROP_SHADOW_TYPE] =
g_param_spec_enum ("shadow-type",
P_("Shadow Type"),
P_("Style of bevel around the contents"),
GTK_TYPE_SHADOW_TYPE,
GTK_SHADOW_NONE,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
properties[PROP_HAS_FRAME] =
g_param_spec_boolean ("has-frame",
P_("Has Frame"),
P_("Whether to draw a frame around the contents"),
FALSE,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
/**
* GtkScrolledWindow:min-content-width:
@ -2408,52 +2408,50 @@ gtk_scrolled_window_unset_placement (GtkScrolledWindow *scrolled_window)
}
/**
* gtk_scrolled_window_set_shadow_type:
* gtk_scrolled_window_set_has_frame:
* @scrolled_window: a #GtkScrolledWindow
* @type: kind of shadow to draw around scrolled window contents
* @type: whether to draw a frame around scrolled window contents
*
* Changes the type of shadow drawn around the contents of
* @scrolled_window.
* Changes the frame drawn around the contents of @scrolled_window.
**/
void
gtk_scrolled_window_set_shadow_type (GtkScrolledWindow *scrolled_window,
GtkShadowType type)
gtk_scrolled_window_set_has_frame (GtkScrolledWindow *scrolled_window,
gboolean has_frame)
{
GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
g_return_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window));
g_return_if_fail (type >= GTK_SHADOW_NONE && type <= GTK_SHADOW_ETCHED_OUT);
if (priv->shadow_type != type)
{
priv->shadow_type = type;
if (priv->has_frame == has_frame)
return;
if (type != GTK_SHADOW_NONE)
gtk_widget_add_css_class (GTK_WIDGET (scrolled_window), GTK_STYLE_CLASS_FRAME);
else
gtk_widget_remove_css_class (GTK_WIDGET (scrolled_window), GTK_STYLE_CLASS_FRAME);
priv->has_frame = has_frame;
g_object_notify_by_pspec (G_OBJECT (scrolled_window), properties[PROP_SHADOW_TYPE]);
}
if (has_frame)
gtk_widget_add_css_class (GTK_WIDGET (scrolled_window), GTK_STYLE_CLASS_FRAME);
else
gtk_widget_remove_css_class (GTK_WIDGET (scrolled_window), GTK_STYLE_CLASS_FRAME);
g_object_notify_by_pspec (G_OBJECT (scrolled_window), properties[PROP_HAS_FRAME]);
}
/**
* gtk_scrolled_window_get_shadow_type:
* gtk_scrolled_window_get_has_frame:
* @scrolled_window: a #GtkScrolledWindow
*
* Gets the shadow type of the scrolled window. See
* gtk_scrolled_window_set_shadow_type().
* Gets whether the scrolled window draws a frame.
* See gtk_scrolled_window_set_has_frame().
*
* Returns: the current shadow type
* Returns: %TRUE if the @scrolled_window has a frame
**/
GtkShadowType
gtk_scrolled_window_get_shadow_type (GtkScrolledWindow *scrolled_window)
gboolean
gtk_scrolled_window_get_has_frame (GtkScrolledWindow *scrolled_window)
{
GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_NONE);
g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window), FALSE);
return priv->shadow_type;
return priv->has_frame;
}
/**
@ -2645,9 +2643,9 @@ gtk_scrolled_window_set_property (GObject *object,
gtk_scrolled_window_set_placement (scrolled_window,
g_value_get_enum (value));
break;
case PROP_SHADOW_TYPE:
gtk_scrolled_window_set_shadow_type (scrolled_window,
g_value_get_enum (value));
case PROP_HAS_FRAME:
gtk_scrolled_window_set_has_frame (scrolled_window,
g_value_get_boolean (value));
break;
case PROP_MIN_CONTENT_WIDTH:
gtk_scrolled_window_set_min_content_width (scrolled_window,
@ -2709,8 +2707,8 @@ gtk_scrolled_window_get_property (GObject *object,
case PROP_WINDOW_PLACEMENT:
g_value_set_enum (value, priv->window_placement);
break;
case PROP_SHADOW_TYPE:
g_value_set_enum (value, priv->shadow_type);
case PROP_HAS_FRAME:
g_value_set_boolean (value, priv->has_frame);
break;
case PROP_HSCROLLBAR_POLICY:
g_value_set_enum (value, priv->hscrollbar_policy);

6
gtk/gtkscrolledwindow.h
View File

@ -125,10 +125,10 @@ void gtk_scrolled_window_unset_placement (GtkScrolledWindow *scrolle
GDK_AVAILABLE_IN_ALL
GtkCornerType gtk_scrolled_window_get_placement (GtkScrolledWindow *scrolled_window);
GDK_AVAILABLE_IN_ALL
void gtk_scrolled_window_set_shadow_type (GtkScrolledWindow *scrolled_window,
GtkShadowType type);
void gtk_scrolled_window_set_has_frame (GtkScrolledWindow *scrolled_window,
gboolean has_frame);
GDK_AVAILABLE_IN_ALL
GtkShadowType gtk_scrolled_window_get_shadow_type (GtkScrolledWindow *scrolled_window);
gboolean gtk_scrolled_window_get_has_frame (GtkScrolledWindow *scrolled_window);
GDK_AVAILABLE_IN_ALL
gint gtk_scrolled_window_get_min_content_width (GtkScrolledWindow *scrolled_window);

10
gtk/gtktreeviewcolumn.c
View File

@ -25,7 +25,6 @@
#include "gtkcellareacontext.h"
#include "gtkcelllayout.h"
#include "gtkdragsource.h"
#include "gtkframe.h"
#include "gtkimage.h"
#include "gtkintl.h"
#include "gtklabel.h"
@ -869,8 +868,7 @@ gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column)
g_signal_connect (controller, "enter", G_CALLBACK (focus_in), tree_column);
gtk_widget_add_controller (priv->button, controller);
priv->frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (priv->frame), GTK_SHADOW_NONE);
priv->frame = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_set_hexpand (priv->frame, TRUE);
gtk_widget_set_halign (priv->frame, GTK_ALIGN_START);
@ -880,9 +878,7 @@ gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column)
if (priv->child)
child = priv->child;
else
{
child = gtk_label_new (priv->title);
}
child = gtk_label_new (priv->title);
g_signal_connect (child, "mnemonic-activate",
G_CALLBACK (gtk_tree_view_column_mnemonic_activate),
@ -923,7 +919,7 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
hbox = gtk_bin_get_child (GTK_BIN (priv->button));
frame = priv->frame;
arrow = priv->arrow;
current_child = gtk_bin_get_child (GTK_BIN (frame));
current_child = gtk_widget_get_first_child (frame);
/* Set up the actual button */
if (priv->child)

69
gtk/gtkviewport.c
View File

@ -75,8 +75,7 @@ struct _GtkViewportPrivate
{
GtkAdjustment *hadjustment;
GtkAdjustment *vadjustment;
GtkShadowType shadow_type;
/* GtkScrollablePolicy needs to be checked when
* driving the scrollable adjustment values */
guint hscroll_policy : 1;
@ -93,8 +92,7 @@ enum {
PROP_HADJUSTMENT,
PROP_VADJUSTMENT,
PROP_HSCROLL_POLICY,
PROP_VSCROLL_POLICY,
PROP_SHADOW_TYPE
PROP_VSCROLL_POLICY
};
@ -254,15 +252,6 @@ gtk_viewport_class_init (GtkViewportClass *class)
g_object_class_override_property (gobject_class, PROP_HSCROLL_POLICY, "hscroll-policy");
g_object_class_override_property (gobject_class, PROP_VSCROLL_POLICY, "vscroll-policy");
g_object_class_install_property (gobject_class,
PROP_SHADOW_TYPE,
g_param_spec_enum ("shadow-type",
P_("Shadow type"),
P_("Determines how the shadowed box around the viewport is drawn"),
GTK_TYPE_SHADOW_TYPE,
GTK_SHADOW_IN,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
gtk_widget_class_set_css_name (widget_class, I_("viewport"));
}
@ -299,9 +288,6 @@ gtk_viewport_set_property (GObject *object,
g_object_notify_by_pspec (object, pspec);
}
break;
case PROP_SHADOW_TYPE:
gtk_viewport_set_shadow_type (viewport, g_value_get_enum (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@ -331,9 +317,6 @@ gtk_viewport_get_property (GObject *object,
case PROP_VSCROLL_POLICY:
g_value_set_enum (value, priv->vscroll_policy);
break;
case PROP_SHADOW_TYPE:
g_value_set_enum (value, priv->shadow_type);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@ -350,7 +333,6 @@ gtk_viewport_init (GtkViewport *viewport)
gtk_widget_set_overflow (widget, GTK_OVERFLOW_HIDDEN);
priv->shadow_type = GTK_SHADOW_IN;
priv->hadjustment = NULL;
priv->vadjustment = NULL;
@ -441,53 +423,6 @@ viewport_set_adjustment (GtkViewport *viewport,
gtk_viewport_adjustment_value_changed (adjustment, viewport);
}
/**
* gtk_viewport_set_shadow_type:
* @viewport: a #GtkViewport.
* @type: the new shadow type.
*
* Sets the shadow type of the viewport.
**/
void
gtk_viewport_set_shadow_type (GtkViewport *viewport,
GtkShadowType type)
{
GtkViewportPrivate *priv = gtk_viewport_get_instance_private (viewport);
g_return_if_fail (GTK_IS_VIEWPORT (viewport));
if ((GtkShadowType) priv->shadow_type != type)
{
priv->shadow_type = type;
if (type != GTK_SHADOW_NONE)
gtk_widget_add_css_class (GTK_WIDGET (viewport), GTK_STYLE_CLASS_FRAME);
else
gtk_widget_remove_css_class (GTK_WIDGET (viewport), GTK_STYLE_CLASS_FRAME);
g_object_notify (G_OBJECT (viewport), "shadow-type");
}
}
/**
* gtk_viewport_get_shadow_type:
* @viewport: a #GtkViewport
*
* Gets the shadow type of the #GtkViewport. See
* gtk_viewport_set_shadow_type().
*
* Returns: the shadow type
**/
GtkShadowType
gtk_viewport_get_shadow_type (GtkViewport *viewport)
{
GtkViewportPrivate *priv = gtk_viewport_get_instance_private (viewport);
g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), GTK_SHADOW_NONE);
return priv->shadow_type;
}
static void
gtk_viewport_size_allocate (GtkWidget *widget,
int width,

7
gtk/gtkviewport.h
View File

@ -50,13 +50,6 @@ GDK_AVAILABLE_IN_ALL
GtkWidget* gtk_viewport_new (GtkAdjustment *hadjustment,
GtkAdjustment *vadjustment);
GDK_AVAILABLE_IN_ALL
void gtk_viewport_set_shadow_type (GtkViewport *viewport,
GtkShadowType type);
GDK_AVAILABLE_IN_ALL
GtkShadowType gtk_viewport_get_shadow_type (GtkViewport *viewport);
G_END_DECLS

4
gtk/inspector/css-editor.ui
View File

@ -29,7 +29,7 @@
<property name="margin-bottom">6</property>
<child>
<object class="GtkToggleButton" id="disable_button">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="tooltip-text" translatable="yes">Disable this custom CSS</property>
<property name="icon-name">media-playback-pause-symbolic</property>
<signal name="toggled" handler="disable_toggled"/>
@ -37,7 +37,7 @@
</child>
<child>
<object class="GtkButton" id="save_button">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="tooltip-text" translatable="yes">Save the current CSS</property>
<property name="icon-name">document-save-symbolic</property>
<signal name="clicked" handler="save_clicked"/>

2
gtk/inspector/data-list.ui
View File

@ -10,7 +10,7 @@
<property name="margin-bottom">6</property>
<child>
<object class="GtkToggleButton" id="show_button">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="tooltip-text" translatable="yes">Show data</property>
<property name="icon-name">view-refresh-symbolic</property>
<signal name="toggled" handler="toggle_show"/>

2
gtk/inspector/object-tree.c
View File

@ -1020,7 +1020,7 @@ gtk_inspector_object_tree_create_list_widget (gpointer row_item,
child = g_object_new (GTK_TYPE_BOX, "css-name", "expander", NULL);
title = g_object_new (GTK_TYPE_TOGGLE_BUTTON, "css-name", "title", NULL);
gtk_button_set_relief (GTK_BUTTON (title), GTK_RELIEF_NONE);
gtk_button_set_has_frame (GTK_BUTTON (title), FALSE);
g_object_bind_property (row_item, "expanded", title, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
gtk_container_add (GTK_CONTAINER (child), title);

4
gtk/inspector/recorder.c
View File

@ -324,7 +324,7 @@ create_widget_for_render_node (gpointer row_item,
child = g_object_new (GTK_TYPE_BOX, "css-name", "expander", NULL);
title = g_object_new (GTK_TYPE_TOGGLE_BUTTON, "css-name", "title", NULL);
gtk_button_set_relief (GTK_BUTTON (title), GTK_RELIEF_NONE);
gtk_button_set_has_frame (GTK_BUTTON (title), FALSE);
g_object_bind_property (row_item, "expanded", title, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
gtk_container_add (GTK_CONTAINER (child), title);
g_object_set_data_full (G_OBJECT (row), "make-sure-its-not-unreffed", g_object_ref (row_item), g_object_unref);
@ -1117,7 +1117,7 @@ gtk_inspector_recorder_recordings_list_create_widget (gpointer item,
gtk_container_add (GTK_CONTAINER (hbox), label);
button = gtk_toggle_button_new ();
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
gtk_button_set_icon_name (GTK_BUTTON (button), "view-more-symbolic");
gtk_container_add (GTK_CONTAINER (hbox), button);

8
gtk/inspector/recorder.ui
View File

@ -13,7 +13,7 @@
<property name="margin-bottom">6</property>
<child>
<object class="GtkToggleButton">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="icon-name">media-record-symbolic</property>
<property name="tooltip-text" translatable="yes">Record frames</property>
<property name="active" bind-source="GtkInspectorRecorder" bind-property="recording" bind-flags="bidirectional|sync-create"/>
@ -21,7 +21,7 @@
</child>
<child>
<object class="GtkButton">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="icon-name">edit-clear-all-symbolic</property>
<property name="tooltip-text" translatable="yes">Clear recorded frames</property>
<signal name="clicked" handler="recordings_clear_all"/>
@ -29,7 +29,7 @@
</child>
<child>
<object class="GtkToggleButton">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="icon-name">insert-object-symbolic</property>
<property name="tooltip-text" translatable="yes">Add debug nodes</property>
<property name="active" bind-source="GtkInspectorRecorder" bind-property="debug-nodes" bind-flags="bidirectional|sync-create"/>
@ -39,7 +39,7 @@
</child>
<child>
<object class="GtkButton" id="render_node_save_button">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="sensitive">0</property>
<property name="icon-name">document-save-as-symbolic</property>
<property name="tooltip-text" translatable="yes">Save selected node</property>

4
gtk/inspector/resource-list.ui
View File

@ -204,7 +204,7 @@
<object class="GtkScrolledWindow">
<property name="hexpand">1</property>
<property name="vexpand">1</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<style>
<class name="view"/>
</style>
@ -225,7 +225,7 @@
<object class="GtkScrolledWindow">
<property name="hexpand">1</property>
<property name="vexpand">1</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<style>
<class name="view"/>
</style>

4
gtk/inspector/type-info.ui
View File

@ -17,7 +17,7 @@
</child>
<child>
<object class="GtkScrolledWindow">
<property name="shadow-type">etched-in</property>
<property name="has-frame">1</property>
<property name="min-content-width">200</property>
<property name="max-content-height">200</property>
<property name="propagate-natural-width">1</property>
@ -38,7 +38,7 @@
</child>
<child>
<object class="GtkScrolledWindow">
<property name="shadow-type">etched-in</property>
<property name="has-frame">1</property>
<property name="min-content-width">200</property>
<property name="max-content-height">150</property>
<property name="propagate-natural-width">1</property>

4
gtk/inspector/window.ui
View File

@ -230,7 +230,7 @@
<object class="GtkButton">
<property name="icon-name">go-previous-symbolic</property>
<property name="tooltip-text" translatable="yes">Toggle Sidebar</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="margin-start">6</property>
<property name="margin-end">6</property>
<property name="margin-top">6</property>
@ -262,7 +262,7 @@
<property name="margin-bottom">6</property>
<property name="icon-name">view-refresh-symbolic</property>
<property name="tooltip-text" translatable="yes">Refresh action state</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
</object>
</property>
</object>

7
gtk/theme/Adwaita/_common.scss
View File

@ -3468,6 +3468,13 @@ calendar {
}
}
> label:focus {
outline-color: $focus_border_color;
outline-offset: -2px;
outline-width: 2px;
outline-style: solid;
}
> label.day-number {
padding: 4px;

6
gtk/ui/gtkaboutdialog.ui
View File

@ -125,7 +125,7 @@
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="hscrollbar-policy">never</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="vexpand">1</property>
<child>
<object class="GtkViewport" id="viewport1">
@ -165,7 +165,7 @@
<child>
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="hscrollbar-policy">never</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="vexpand">1</property>
<child>
<object class="GtkTextView" id="license_view">
@ -208,7 +208,7 @@
<child>
<object class="GtkScrolledWindow">
<property name="hscrollbar-policy">never</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="vexpand">1</property>
<child>
<object class="GtkTextView" id="system_view">

2
gtk/ui/gtkappchooserwidget.ui
View File

@ -25,7 +25,7 @@
<property name="width-request">400</property>
<property name="height-request">300</property>
<property name="hscrollbar-policy">never</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<child>
<object class="GtkTreeView" id="program_list">
<property name="model">program_list_sort</property>

20
gtk/ui/gtkemojichooser.ui
View File

@ -215,7 +215,7 @@
</style>
<child>
<object class="GtkButton" id="recent.button">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="tooltip-text" translatable="yes" context="emoji category">Recent</property>
<style>
<class name="emoji-section"/>
@ -224,7 +224,7 @@
</child>
<child>
<object class="GtkButton" id="people.button">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="tooltip-text" translatable="yes" context="emoji category">Smileys &amp; People</property>
<style>
<class name="emoji-section"/>
@ -233,7 +233,7 @@
</child>
<child>
<object class="GtkButton" id="body.button">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="tooltip-text" translatable="yes" context="emoji category">Body &amp; Clothing</property>
<style>
<class name="emoji-section"/>
@ -242,7 +242,7 @@
</child>
<child>
<object class="GtkButton" id="nature.button">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="tooltip-text" translatable="yes" context="emoji category">Animals &amp; Nature</property>
<style>
<class name="emoji-section"/>
@ -251,7 +251,7 @@
</child>
<child>
<object class="GtkButton" id="food.button">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="tooltip-text" translatable="yes" context="emoji category">Food &amp; Drink</property>
<style>
<class name="emoji-section"/>
@ -260,7 +260,7 @@
</child>
<child>
<object class="GtkButton" id="travel.button">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="tooltip-text" translatable="yes" context="emoji category">Travel &amp; Places</property>
<style>
<class name="emoji-section"/>
@ -269,7 +269,7 @@
</child>
<child>
<object class="GtkButton" id="activities.button">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="tooltip-text" translatable="yes" context="emoji category">Activities</property>
<style>
<class name="emoji-section"/>
@ -278,7 +278,7 @@
</child>
<child>
<object class="GtkButton" id="objects.button">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="tooltip-text" translatable="yes" context="emoji category">Objects</property>
<style>
<class name="emoji-section"/>
@ -287,7 +287,7 @@
</child>
<child>
<object class="GtkButton" id="symbols.button">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="tooltip-text" translatable="yes" context="emoji category">Symbols</property>
<style>
<class name="emoji-section"/>
@ -296,7 +296,7 @@
</child>
<child>
<object class="GtkButton" id="flags.button">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="tooltip-text" translatable="yes" context="emoji category">Flags</property>
<style>
<class name="emoji-section"/>

4
gtk/ui/gtkfontchooserwidget.ui
View File

@ -64,7 +64,7 @@
<property name="hexpand">1</property>
<property name="vexpand">1</property>
<property name="hscrollbar-policy">never</property>
<property name="shadow-type">etched-in</property>
<property name="has-frame">1</property>
<child>
<object class="GtkTreeView" id="family_face_list">
<property name="model">filter_model</property>
@ -236,7 +236,7 @@
<child>
<object class="GtkScrolledWindow">
<property name="hscrollbar-policy">never</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="vexpand">1</property>
<style>
<class name="view"/>

5
gtk/ui/gtkplacesview.ui
View File

@ -148,12 +148,11 @@
<child>
<object class="GtkScrolledWindow">
<property name="vexpand">1</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="min-content-width">250</property>
<property name="min-content-height">200</property>
<child>
<object class="GtkViewport">
<property name="shadow-type">none</property>
<child>
<object class="GtkListBox" id="recent_servers_listbox">
<property name="selection-mode">none</property>
@ -182,14 +181,12 @@
<property name="name">browse</property>
<property name="child">
<object class="GtkFrame">
<property name="shadow-type">none</property>
<child>
<object class="GtkScrolledWindow">
<property name="hexpand">1</property>
<property name="vexpand">1</property>
<child>
<object class="GtkViewport">
<property name="shadow-type">none</property>
<child>
<object class="GtkListBox" id="listbox">
<property name="selection-mode">none</property>

6
gtk/ui/gtkprintunixdialog.ui
View File

@ -69,7 +69,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="printer_swin">
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="vexpand">1</property>
<child>
<object class="GtkTreeView" id="printer_treeview">
@ -977,7 +977,6 @@
<property name="hexpand">1</property>
<child>
<object class="GtkViewport" id="viewport1">
<property name="shadow-type">none</property>
<child>
<object class="GtkGrid" id="image_quality_table">
<property name="row-spacing">6</property>
@ -1007,7 +1006,6 @@
<property name="hscrollbar-policy">never</property>
<child>
<object class="GtkViewport" id="viewport2">
<property name="shadow-type">none</property>
<child>
<object class="GtkGrid" id="color_table">
<property name="row-spacing">6</property>
@ -1037,7 +1035,6 @@
<property name="hscrollbar-policy">never</property>
<child>
<object class="GtkViewport" id="viewport3">
<property name="shadow-type">none</property>
<child>
<object class="GtkGrid" id="finishing_table">
<property name="row-spacing">6</property>
@ -1067,7 +1064,6 @@
<property name="hscrollbar-policy">never</property>
<child>
<object class="GtkViewport" id="viewport4">
<property name="shadow-type">none</property>
<child>
<object class="GtkBox" id="advanced_vbox">
<property name="orientation">vertical</property>

6
gtk/ui/gtkscalebutton.ui
View File

@ -6,7 +6,7 @@
<property name="receives-default">1</property>
<property name="focus-on-click">0</property>
<property name="icon-name">image-missing</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
</object>
</child>
</template>
@ -26,7 +26,7 @@
<child>
<object class="GtkButton" id="plus_button">
<property name="receives-default">1</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="icon-name">list-add-symbolic</property>
@ -46,7 +46,7 @@
<child>
<object class="GtkButton" id="minus_button">
<property name="receives-default">1</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="icon-name">list-remove-symbolic</property>

1
gtk/ui/gtkstatusbar.ui
View File

@ -3,7 +3,6 @@
<template class="GtkStatusbar" parent="GtkWidget">
<child>
<object class="GtkFrame" id="frame">
<property name="shadow-type">none</property>
<property name="hexpand">1</property>
<child>
<object class="GtkBox" id="message_area">

3
tests/print-editor.c
View File

@ -757,8 +757,7 @@ activate (GApplication *app)
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
GTK_SHADOW_IN);
gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
gtk_widget_set_vexpand (sw, TRUE);
gtk_container_add (GTK_CONTAINER (box), sw);

1
tests/testcalendar.c
View File

@ -155,7 +155,6 @@ create_frame (const char *caption,
"halign", halign,
"valign", valign,
NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
gtk_label_set_markup (GTK_LABEL (label), caption);
gtk_container_add (GTK_CONTAINER (frame), child);

2
tests/testcellrenderertext.c
View File

@ -174,7 +174,7 @@ create_tree (gboolean rtl)
GdkPixbuf *pixbuf;
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
gtk_widget_set_direction (sw, rtl ? GTK_TEXT_DIR_RTL : GTK_TEXT_DIR_LTR);
list_store = create_list_store ();

2
tests/testexpander.c
View File

@ -50,7 +50,7 @@ main (int argc, char *argv[])
expander = gtk_expander_new ("Details:");
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);

1
tests/testfilechooserbutton.c
View File

@ -311,7 +311,6 @@ main (int argc,
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (win))), vbox);
frame = gtk_frame_new ("<b>GtkFileChooserButton</b>");
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
gtk_label_set_use_markup (GTK_LABEL (gtk_frame_get_label_widget (GTK_FRAME (frame))), TRUE);
gtk_container_add (GTK_CONTAINER (vbox), frame);

1
tests/testflowbox.c
View File

@ -71,7 +71,6 @@ populate_flowbox_focus (GtkFlowBox *flowbox)
{
sensitive = TRUE;
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_container_add (GTK_CONTAINER (frame), box);

17
tests/testframe.c
View File

@ -115,15 +115,6 @@ spin_xalign_cb (GtkSpinButton *spin, GtkFrame *frame)
gtk_frame_set_label_align (frame, xalign);
}
static void
draw_border_cb (GtkToggleButton *toggle_button, GtkFrame *frame)
{
GtkShadowType shadow_type = gtk_toggle_button_get_active (toggle_button)
? GTK_SHADOW_IN : GTK_SHADOW_NONE;
gtk_frame_set_shadow_type (frame, shadow_type);
}
static void
quit_cb (GtkWidget *widget,
gpointer data)
@ -142,7 +133,6 @@ int main (int argc, char **argv)
GtkFrame *frame;
GtkGrid *grid;
gfloat xalign;
gboolean draw_border;
gboolean done = FALSE;
gtk_init ();
@ -200,13 +190,6 @@ int main (int argc, char **argv)
gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), 0);
gtk_grid_attach (grid, widget, 1, 2, 1, 1);
/* CheckButton to control whether to draw border */
draw_border = gtk_frame_get_shadow_type (frame) != GTK_SHADOW_NONE;
widget = gtk_check_button_new_with_label ("draw border");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), draw_border);
g_signal_connect (widget, "toggled", G_CALLBACK (draw_border_cb), frame);
gtk_grid_attach (grid, widget, 0, 3, 1, 1);
gtk_widget_show (window);
while (!done)

13
tests/testgtk.c
View File

@ -4229,7 +4229,6 @@ create_panes (GtkWidget *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);
@ -4237,12 +4236,10 @@ create_panes (GtkWidget *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);
@ -4307,7 +4304,6 @@ paned_keyboard_window1 (GtkWidget *widget)
frame1 = gtk_frame_new (NULL);
gtk_paned_pack1 (GTK_PANED (hpaned1), frame1, FALSE, TRUE);
gtk_frame_set_shadow_type (GTK_FRAME (frame1), GTK_SHADOW_IN);
vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (frame1), vbox1);
@ -4326,7 +4322,6 @@ paned_keyboard_window1 (GtkWidget *widget)
frame2 = gtk_frame_new (NULL);
gtk_paned_pack1 (GTK_PANED (vpaned1), frame2, FALSE, TRUE);
gtk_frame_set_shadow_type (GTK_FRAME (frame2), GTK_SHADOW_IN);
frame5 = gtk_frame_new (NULL);
gtk_container_add (GTK_CONTAINER (frame2), frame5);
@ -4342,7 +4337,6 @@ paned_keyboard_window1 (GtkWidget *widget)
frame3 = gtk_frame_new (NULL);
gtk_paned_pack2 (GTK_PANED (vpaned1), frame3, TRUE, TRUE);
gtk_frame_set_shadow_type (GTK_FRAME (frame3), GTK_SHADOW_IN);
frame4 = gtk_frame_new ("Buttons");
gtk_container_add (GTK_CONTAINER (frame3), frame4);
@ -4391,7 +4385,6 @@ paned_keyboard_window2 (GtkWidget *widget)
frame6 = gtk_frame_new (NULL);
gtk_paned_pack1 (GTK_PANED (hpaned2), frame6, FALSE, TRUE);
gtk_frame_set_shadow_type (GTK_FRAME (frame6), GTK_SHADOW_IN);
button13 = gtk_button_new_with_label ("button13");
gtk_container_add (GTK_CONTAINER (frame6), button13);
@ -4404,14 +4397,12 @@ paned_keyboard_window2 (GtkWidget *widget)
frame7 = gtk_frame_new (NULL);
gtk_paned_pack1 (GTK_PANED (vpaned2), frame7, FALSE, TRUE);
gtk_frame_set_shadow_type (GTK_FRAME (frame7), GTK_SHADOW_IN);
button12 = gtk_button_new_with_label ("button12");
gtk_container_add (GTK_CONTAINER (frame7), button12);
frame8 = gtk_frame_new (NULL);
gtk_paned_pack2 (GTK_PANED (vpaned2), frame8, TRUE, TRUE);
gtk_frame_set_shadow_type (GTK_FRAME (frame8), GTK_SHADOW_IN);
button11 = gtk_button_new_with_label ("button11");
gtk_container_add (GTK_CONTAINER (frame8), button11);
@ -4459,7 +4450,6 @@ paned_keyboard_window3 (GtkWidget *widget)
frame9 = gtk_frame_new (NULL);
gtk_paned_pack1 (GTK_PANED (hpaned3), frame9, FALSE, TRUE);
gtk_frame_set_shadow_type (GTK_FRAME (frame9), GTK_SHADOW_IN);
button14 = gtk_button_new_with_label ("button14");
gtk_container_add (GTK_CONTAINER (frame9), button14);
@ -4469,7 +4459,6 @@ paned_keyboard_window3 (GtkWidget *widget)
frame10 = gtk_frame_new (NULL);
gtk_paned_pack1 (GTK_PANED (hpaned4), frame10, FALSE, TRUE);
gtk_frame_set_shadow_type (GTK_FRAME (frame10), GTK_SHADOW_IN);
button15 = gtk_button_new_with_label ("button15");
gtk_container_add (GTK_CONTAINER (frame10), button15);
@ -4479,14 +4468,12 @@ paned_keyboard_window3 (GtkWidget *widget)
frame11 = gtk_frame_new (NULL);
gtk_paned_pack1 (GTK_PANED (hpaned5), frame11, FALSE, TRUE);
gtk_frame_set_shadow_type (GTK_FRAME (frame11), GTK_SHADOW_IN);
button16 = gtk_button_new_with_label ("button16");
gtk_container_add (GTK_CONTAINER (frame11), button16);
frame12 = gtk_frame_new (NULL);
gtk_paned_pack2 (GTK_PANED (hpaned5), frame12, TRUE, TRUE);
gtk_frame_set_shadow_type (GTK_FRAME (frame12), GTK_SHADOW_IN);
button17 = gtk_button_new_with_label ("button17");
gtk_container_add (GTK_CONTAINER (frame12), button17);

2
tests/testtreeedit.c
View File

@ -255,7 +255,7 @@ main (gint argc, gchar **argv)
gtk_container_add (GTK_CONTAINER (window), vbox);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window), TRUE);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_widget_set_vexpand (scrolled_window, TRUE);

4
tests/testtreefocus.c
View File

@ -368,7 +368,7 @@ main (int argc, char *argv[])
gtk_container_add (GTK_CONTAINER (window), vbox);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window), TRUE);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_widget_set_vexpand (scrolled_window, TRUE);
gtk_container_add (GTK_CONTAINER (vbox), scrolled_window);
@ -483,7 +483,7 @@ main (int argc, char *argv[])
gtk_container_add (GTK_CONTAINER (window), vbox);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window), TRUE);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_widget_set_vexpand (scrolled_window, TRUE);
gtk_container_add (GTK_CONTAINER (vbox), scrolled_window);

2
tests/testtreelistmodel.c
View File

@ -192,7 +192,7 @@ create_widget_for_model (gpointer item,
child = g_object_new (GTK_TYPE_BOX, "css-name", "expander", NULL);
title = g_object_new (GTK_TYPE_TOGGLE_BUTTON, "css-name", "title", NULL);
gtk_button_set_relief (GTK_BUTTON (title), GTK_RELIEF_NONE);
gtk_button_set_has_frame (GTK_BUTTON (title), FALSE);
g_object_bind_property (item, "expanded", title, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
g_object_set_data_full (G_OBJECT (title), "make-sure-its-not-unreffed", g_object_ref (item), g_object_unref);
gtk_container_add (GTK_CONTAINER (child), title);

8
tests/testtreesort.c
View File

@ -132,7 +132,7 @@ main (int argc, char *argv[])
gtk_container_add (GTK_CONTAINER (vbox), button);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window), TRUE);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_widget_set_vexpand (scrolled_window, TRUE);
gtk_container_add (GTK_CONTAINER (vbox), scrolled_window);
@ -255,8 +255,7 @@ main (int argc, char *argv[])
gtk_container_add (GTK_CONTAINER (window2), vbox2);
scrolled_window2 = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window2),
GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window2), TRUE);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window2),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
@ -324,8 +323,7 @@ main (int argc, char *argv[])
gtk_container_add (GTK_CONTAINER (window3), vbox3);
scrolled_window3 = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window3),
GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window3), TRUE);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window3),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);

2
tests/testverticalcells.c
View File

@ -321,7 +321,7 @@ main (gint argc, gchar **argv)
g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window), TRUE);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_container_add (GTK_CONTAINER (window), scrolled_window);

28
testsuite/gtk/focus-chain/widget-factory.ui
View File

@ -866,7 +866,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<property name="label" translatable="yes">link button</property>
<property name="receives-default">1</property>
<property name="has-tooltip">1</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="uri">http://www.gtk.org</property>
</object>
</child>
@ -1115,7 +1115,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="width-request">150</property>
<property name="vscrollbar-policy">always</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="vexpand">1</property>
<child>
<object class="GtkTreeView" id="treeview1">
@ -1189,7 +1189,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="vexpand">1</property>
<child>
<object class="GtkTextView" id="textview1">
@ -1451,7 +1451,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<child>
<object class="GtkButton" id="page2dismiss">
<property name="focus-on-click">0</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="icon-name">window-close-symbolic</property>
</object>
</child>
@ -1598,7 +1598,7 @@ microphone-sensitivity-medium-symbolic</property>
</child>
<child>
<object class="GtkScrolledWindow">
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="hscrollbar-policy">never</property>
<property name="min-content-height">200</property>
<property name="hexpand">0</property>
@ -2000,7 +2000,7 @@ microphone-sensitivity-medium-symbolic</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow3">
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="margin-top">6</property>
<property name="height-request">226</property>
<child>
@ -2103,7 +2103,7 @@ microphone-sensitivity-medium-symbolic</property>
<property name="hscrollbar-policy">never</property>
<property name="vscrollbar-policy">always</property>
<property name="height-request">300</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<child>
<object class="GtkTreeView" id="charletree">
<property name="enable-grid-lines">vertical</property>
@ -2169,7 +2169,7 @@ microphone-sensitivity-medium-symbolic</property>
<object class="GtkScrolledWindow">
<property name="hscrollbar-policy">never</property>
<property name="vexpand">1</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<child>
<object class="GtkListBox" id="munsell">
<property name="selection-mode">multiple</property>
@ -2633,7 +2633,7 @@ microphone-sensitivity-medium-symbolic</property>
<property name="valign">center</property>
<property name="popover">notebook_info_popover2</property>
<property name="icon-name">emblem-important-symbolic</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<style>
<class name="circular"/>
</style>
@ -2658,7 +2658,7 @@ microphone-sensitivity-medium-symbolic</property>
</child>
<child>
<object class="GtkButton">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="focus-on-click">0</property>
<property name="icon-name">window-close-symbolic</property>
<style>
@ -2689,7 +2689,7 @@ microphone-sensitivity-medium-symbolic</property>
</child>
<child>
<object class="GtkButton">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="focus-on-click">0</property>
<property name="icon-name">window-close-symbolic</property>
<style>
@ -2774,7 +2774,7 @@ microphone-sensitivity-medium-symbolic</property>
<property name="valign">center</property>
<property name="popover">notebook_info_popover</property>
<property name="icon-name">emblem-important-symbolic</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<style>
<class name="circular"/>
</style>
@ -3132,7 +3132,7 @@ bad things might happen.</property>
<child>
<object class="GtkScrolledWindow">
<property name="valign">start</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="min-content-height">70</property>
<property name="max-content-height">120</property>
<property name="min-content-width">100</property>
@ -3266,7 +3266,7 @@ bad things might happen.</property>
<property name="valign">center</property>
<property name="popover">notebook_info_popover3</property>
<property name="icon-name">emblem-important-symbolic</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<style>
<class name="circular"/>
</style>

28
testsuite/gtk/focus-chain/widget-factory2.ui
View File

@ -867,7 +867,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<property name="label" translatable="yes">link button</property>
<property name="receives-default">1</property>
<property name="has-tooltip">1</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="uri">http://www.gtk.org</property>
</object>
</child>
@ -1116,7 +1116,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="width-request">150</property>
<property name="vscrollbar-policy">always</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="vexpand">1</property>
<child>
<object class="GtkTreeView" id="treeview1">
@ -1190,7 +1190,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="vexpand">1</property>
<child>
<object class="GtkTextView" id="textview1">
@ -1452,7 +1452,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<child>
<object class="GtkButton" id="page2dismiss">
<property name="focus-on-click">0</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="icon-name">window-close-symbolic</property>
</object>
</child>
@ -1599,7 +1599,7 @@ microphone-sensitivity-medium-symbolic</property>
</child>
<child>
<object class="GtkScrolledWindow">
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="hscrollbar-policy">never</property>
<property name="min-content-height">200</property>
<property name="hexpand">0</property>
@ -2001,7 +2001,7 @@ microphone-sensitivity-medium-symbolic</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow3">
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="margin-top">6</property>
<property name="height-request">226</property>
<child>
@ -2104,7 +2104,7 @@ microphone-sensitivity-medium-symbolic</property>
<property name="hscrollbar-policy">never</property>
<property name="vscrollbar-policy">always</property>
<property name="height-request">300</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<child>
<object class="GtkTreeView" id="charletree">
<property name="enable-grid-lines">vertical</property>
@ -2170,7 +2170,7 @@ microphone-sensitivity-medium-symbolic</property>
<object class="GtkScrolledWindow">
<property name="hscrollbar-policy">never</property>
<property name="vexpand">1</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<child>
<object class="GtkListBox" id="munsell">
<property name="selection-mode">multiple</property>
@ -2634,7 +2634,7 @@ microphone-sensitivity-medium-symbolic</property>
<property name="valign">center</property>
<property name="popover">notebook_info_popover2</property>
<property name="icon-name">emblem-important-symbolic</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<style>
<class name="circular"/>
</style>
@ -2659,7 +2659,7 @@ microphone-sensitivity-medium-symbolic</property>
</child>
<child>
<object class="GtkButton">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="focus-on-click">0</property>
<property name="icon-name">window-close-symbolic</property>
<style>
@ -2690,7 +2690,7 @@ microphone-sensitivity-medium-symbolic</property>
</child>
<child>
<object class="GtkButton">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="focus-on-click">0</property>
<property name="icon-name">window-close-symbolic</property>
<style>
@ -2775,7 +2775,7 @@ microphone-sensitivity-medium-symbolic</property>
<property name="valign">center</property>
<property name="popover">notebook_info_popover</property>
<property name="icon-name">emblem-important-symbolic</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<style>
<class name="circular"/>
</style>
@ -3133,7 +3133,7 @@ bad things might happen.</property>
<child>
<object class="GtkScrolledWindow">
<property name="valign">start</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="min-content-height">70</property>
<property name="max-content-height">120</property>
<property name="min-content-width">100</property>
@ -3267,7 +3267,7 @@ bad things might happen.</property>
<property name="valign">center</property>
<property name="popover">notebook_info_popover3</property>
<property name="icon-name">emblem-important-symbolic</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<style>
<class name="circular"/>
</style>

28
testsuite/gtk/focus-chain/widget-factory3.ui
View File

@ -867,7 +867,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<property name="label" translatable="yes">link button</property>
<property name="receives-default">1</property>
<property name="has-tooltip">1</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="uri">http://www.gtk.org</property>
</object>
</child>
@ -1116,7 +1116,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="width-request">150</property>
<property name="vscrollbar-policy">always</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="vexpand">1</property>
<child>
<object class="GtkTreeView" id="treeview1">
@ -1190,7 +1190,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="vexpand">1</property>
<child>
<object class="GtkTextView" id="textview1">
@ -1452,7 +1452,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<child>
<object class="GtkButton" id="page2dismiss">
<property name="focus-on-click">0</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="icon-name">window-close-symbolic</property>
</object>
</child>
@ -1599,7 +1599,7 @@ microphone-sensitivity-medium-symbolic</property>
</child>
<child>
<object class="GtkScrolledWindow">
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="hscrollbar-policy">never</property>
<property name="min-content-height">200</property>
<property name="hexpand">0</property>
@ -2001,7 +2001,7 @@ microphone-sensitivity-medium-symbolic</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow3">
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="margin-top">6</property>
<property name="height-request">226</property>
<child>
@ -2104,7 +2104,7 @@ microphone-sensitivity-medium-symbolic</property>
<property name="hscrollbar-policy">never</property>
<property name="vscrollbar-policy">always</property>
<property name="height-request">300</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<child>
<object class="GtkTreeView" id="charletree">
<property name="enable-grid-lines">vertical</property>
@ -2170,7 +2170,7 @@ microphone-sensitivity-medium-symbolic</property>
<object class="GtkScrolledWindow">
<property name="hscrollbar-policy">never</property>
<property name="vexpand">1</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<child>
<object class="GtkListBox" id="munsell">
<property name="selection-mode">multiple</property>
@ -2634,7 +2634,7 @@ microphone-sensitivity-medium-symbolic</property>
<property name="valign">center</property>
<property name="popover">notebook_info_popover2</property>
<property name="icon-name">emblem-important-symbolic</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<style>
<class name="circular"/>
</style>
@ -2659,7 +2659,7 @@ microphone-sensitivity-medium-symbolic</property>
</child>
<child>
<object class="GtkButton">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="focus-on-click">0</property>
<property name="icon-name">window-close-symbolic</property>
<style>
@ -2690,7 +2690,7 @@ microphone-sensitivity-medium-symbolic</property>
</child>
<child>
<object class="GtkButton">
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="focus-on-click">0</property>
<property name="icon-name">window-close-symbolic</property>
<style>
@ -2775,7 +2775,7 @@ microphone-sensitivity-medium-symbolic</property>
<property name="valign">center</property>
<property name="popover">notebook_info_popover</property>
<property name="icon-name">emblem-important-symbolic</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<style>
<class name="circular"/>
</style>
@ -3133,7 +3133,7 @@ bad things might happen.</property>
<child>
<object class="GtkScrolledWindow">
<property name="valign">start</property>
<property name="shadow-type">in</property>
<property name="has-frame">1</property>
<property name="min-content-height">70</property>
<property name="max-content-height">120</property>
<property name="min-content-width">100</property>
@ -3267,7 +3267,7 @@ bad things might happen.</property>
<property name="valign">center</property>
<property name="popover">notebook_info_popover3</property>
<property name="icon-name">emblem-important-symbolic</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<style>
<class name="circular"/>
</style>

4
testsuite/reftests/link-coloring.ui
View File

@ -15,7 +15,7 @@
<object class="GtkLinkButton" id="linkbutton1">
<property name="label" translatable="yes">A normal link</property>
<property name="receives_default">1</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="uri">http://gnome.org</property>
</object>
</child>
@ -23,7 +23,7 @@
<object class="GtkLinkButton" id="linkbutton2">
<property name="label" translatable="yes">A visited link</property>
<property name="receives_default">1</property>
<property name="relief">none</property>
<property name="has-frame">0</property>
<property name="uri">http://gnome.org</property>
<property name="visited">1</property>
</object>

2
testsuite/reftests/treeview-crash-too-wide.ref.ui
View File

@ -16,7 +16,7 @@ aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aa
<object class="GtkWindow" id="window1">
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="shadow_type">in</property>
<property name="has-frame">1</property>
<child>
<object class="GtkTreeView" id="treeview1">
<property name="model">liststore1</property>

2
testsuite/reftests/treeview-crash-too-wide.ui
View File

@ -16,7 +16,7 @@ aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aa
<object class="GtkWindow" id="window1">
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="shadow_type">in</property>
<property name="has-frame">1</property>
<child>
<object class="GtkTreeView" id="treeview1">
<property name="model">liststore1</property>