diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-07-30 22:43:29 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-07-30 22:43:29 +0000 |
| commit | 8da7e3bdc30d793b5f88e996828a1afe8192468e (patch) | |
| tree | d88ee90c166bc6e82b77b993d9c71db9c3191711 | |
| parent | 06348a85179f138255b448e9968cbbda14f34886 (diff) | |
| parent | 99e4a6a2d624326df9370f0e4468008c19c2db79 (diff) | |
| download | gtk+-8da7e3bdc30d793b5f88e996828a1afe8192468e.tar.gz | |
Merge branch 'wip/otte/for-master' into 'master'
widget-factory: Expand the video to cover the whole frame
See merge request GNOME/gtk!3804
| -rw-r--r-- | demos/widget-factory/widget-factory.ui | 143 |
1 files changed, 71 insertions, 72 deletions
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui index 94126edb36..1f2258d06d 100644 --- a/demos/widget-factory/widget-factory.ui +++ b/demos/widget-factory/widget-factory.ui @@ -1051,22 +1051,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property> <property name="spacing">10</property> <property name="hexpand">1</property> <child> - <object class="GtkFrame" id="frame1"> - <property name="valign">start</property> - <child type="label"> - <object class="GtkLabel" id="label1"> - <property name="label" translatable="yes"><b>Video</b></property> - <property name="use-markup">1</property> - </object> - </child> + <object class="GtkFrame"> <child> <object class="GtkVideo"> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="margin-start">6</property> - <property name="margin-end">6</property> - <property name="margin-top">6</property> - <property name="margin-bottom">6</property> <property name="autoplay">1</property> <property name="loop">1</property> <property name="file">resource:///org/gtk/WidgetFactory4/gtk-logo.webm</property> @@ -1075,66 +1062,78 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property> </object> </child> <child> - <object class="GtkScrolledWindow"> - <property name="vexpand">1</property> - <property name="hscrollbar-policy">never</property> - <property name="vscrollbar-policy">automatic</property> + <object class="GtkFrame"> + <child type="label"> + <object class="GtkLabel" id="label1"> + <property name="label" translatable="yes"><b>Text Styles</b></property> + <property name="use-markup">1</property> + </object> + </child> <child> - <object class="GtkBox"> - <property name="orientation">vertical</property> - <property name="spacing">10</property> - <child> - <object class="GtkLabel"> - <property name="label">Large Title</property> - <style><class name="large-title"/></style> - </object> - </child> - <child> - <object class="GtkLabel"> - <property name="label">Title 1</property> - <style><class name="title-1"/></style> - </object> - </child> - <child> - <object class="GtkLabel"> - <property name="label">Title 2</property> - <style><class name="title-2"/></style> - </object> - </child> - <child> - <object class="GtkLabel"> - <property name="label">Title 3</property> - <style><class name="title-3"/></style> - </object> - </child> - <child> - <object class="GtkLabel"> - <property name="label">Title 4</property> - <style><class name="title-4"/></style> - </object> - </child> - <child> - <object class="GtkLabel"> - <property name="label">Heading</property> - <style><class name="heading"/></style> - </object> - </child> - <child> - <object class="GtkLabel"> - <property name="label">Body</property> - <style><class name="body"/></style> - </object> - </child> - <child> - <object class="GtkLabel"> - <property name="label">Caption Heading</property> - <style><class name="caption-heading"/></style> - </object> - </child> + <object class="GtkScrolledWindow"> + <property name="vexpand">1</property> + <property name="hscrollbar-policy">never</property> + <property name="vscrollbar-policy">automatic</property> + <property name="propagate-natural-height">1</property> + <property name="propagate-natural-width">1</property> <child> - <object class="GtkLabel"> - <property name="label">Caption</property> - <style><class name="caption"/></style> + <object class="GtkBox"> + <property name="orientation">vertical</property> + <property name="spacing">10</property> + <child> + <object class="GtkLabel"> + <property name="label">Large Title</property> + <style><class name="large-title"/></style> + </object> + </child> + <child> + <object class="GtkLabel"> + <property name="label">Title 1</property> + <style><class name="title-1"/></style> + </object> + </child> + <child> + <object class="GtkLabel"> + <property name="label">Title 2</property> + <style><class name="title-2"/></style> + </object> + </child> + <child> + <object class="GtkLabel"> + <property name="label">Title 3</property> + <style><class name="title-3"/></style> + </object> + </child> + <child> + <object class="GtkLabel"> + <property name="label">Title 4</property> + <style><class name="title-4"/></style> + </object> + </child> + <child> + <object class="GtkLabel"> + <property name="label">Heading</property> + <style><class name="heading"/></style> + </object> + </child> + <child> + <object class="GtkLabel"> + <property name="label">Body</property> + <style><class name="body"/></style> + </object> + </child> + <child> + <object class="GtkLabel"> + <property name="label">Caption Heading</property> + <style><class name="caption-heading"/></style> + </object> + </child> + <child> + <object class="GtkLabel"> + <property name="label">Caption</property> + <style><class name="caption"/></style> + </object> + </child> </object> </child> </object> |