AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-19 21:40:22 +00:00
Code Issues Projects Releases Wiki Activity

scrolledwindow: Drop shadow-type

Browse Source 
We were only using this as a boolean, so change it
to a boolean property named has-frame.
This commit is contained in:
Matthias Clasen 2020-04-16 23:25:06 -04:00
parent f297d0684d
commit 285aa226e5
35 changed files with 102 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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>

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>

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

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

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

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

@ -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">
@ -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>
@ -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>

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

@ -2205,8 +2205,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

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

2
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)),

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/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");

74
gtk/gtkscrolledwindow.c
View File

@ -248,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;
@ -309,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,
@ -580,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:
@ -2410,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;
}
/**
@ -2647,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,
@ -2711,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);

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>

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>

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"/>

2
gtk/ui/gtkplacesview.ui
View File

@ -148,7 +148,7 @@
<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>

2
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">

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

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

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

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

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

@ -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">
@ -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>
@ -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>

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

@ -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">
@ -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>
@ -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>

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

@ -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">
@ -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>
@ -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>