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!1626
This commit is contained in:
Matthias Clasen 2020-04-04 05:00:22 +00:00
commit 2bf81b51d9
12 changed files with 2 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,6 @@
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow">
<property name="can-focus">1</property>
<property name="vexpand">1</property>
<property name="shadow-type">in</property>
<property name="min-content-width">150</property>

3
demos/gtk-demo/filtermodel.ui
View File

@ -56,7 +56,6 @@
</child>
<child>
<object class="GtkTreeView" id="treeview1">
<property name="can-focus">1</property>
<property name="model">liststore1</property>
<property name="headers-clickable">0</property>
<child internal-child="selection">
@ -95,7 +94,6 @@
</child>
<child>
<object class="GtkTreeView" id="treeview2">
<property name="can-focus">1</property>
<property name="headers-clickable">0</property>
<property name="search-column">0</property>
<child internal-child="selection">
@ -178,7 +176,6 @@
</child>
<child>
<object class="GtkTreeView" id="treeview3">
<property name="can-focus">1</property>
<property name="headers-clickable">0</property>
<property name="search-column">0</property>
<child internal-child="selection">

4
demos/gtk-demo/font-features.ui
View File

@ -10,7 +10,6 @@
<property name="title">Font Explorer</property>
<child>
<object class="GtkButton" id="reset">
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="tooltip-text">Reset</property>
<signal name="clicked" handler="font_features_reset_features" swapped="no"/>
@ -27,7 +26,6 @@
<object class="GtkBox">
<child>
<object class="GtkScrolledWindow">
<property name="can-focus">1</property>
<property name="hscrollbar-policy">never</property>
<child>
<object class="GtkViewport">
@ -41,7 +39,6 @@
<property name="spacing">6</property>
<child>
<object class="GtkFontButton" id="font">
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="font">Sans 12</property>
<property name="level">family|style|size|variations|features</property>
@ -64,7 +61,6 @@
<property name="orientation">vertical</property>
<child>
<object class="GtkComboBox" id="script_lang">
<property name="can-focus">1</property>
<property name="margin-top">10</property>
<signal name="changed" handler="font_features_script_changed" swapped="no"/>
<child>

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

@ -38,7 +38,6 @@
<property name="baseline-position">top</property>
<child>
<object class="GtkButton" id="button2">
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="valign">baseline</property>
<property name="relief">none</property>
@ -109,7 +108,6 @@
<child>
<object class="GtkLinkButton" id="resent_by_button">
<property name="label" translatable="0">reshareer</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="relief">none</property>
<property name="uri">http://www.gtk.org</property>
@ -127,7 +125,6 @@
<child>
<object class="GtkButton" id="expand_button">
<property name="label" translatable="yes">Expand</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="relief">none</property>
<signal name="clicked" handler="expand_clicked" swapped="yes"/>
@ -140,7 +137,6 @@
<child>
<object class="GtkButton" id="reply-button">
<property name="label" translatable="yes">Reply</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="relief">none</property>
</object>
@ -148,7 +144,6 @@
<child>
<object class="GtkButton" id="reshare-button">
<property name="label" translatable="yes">Reshare</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="relief">none</property>
<signal name="clicked" handler="reshare_clicked" swapped="yes"/>
@ -157,7 +152,6 @@
<child>
<object class="GtkButton" id="favorite-buttton">
<property name="label" translatable="yes">Favorite</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="relief">none</property>
<signal name="clicked" handler="favorite_clicked" swapped="yes"/>
@ -165,7 +159,6 @@
</child>
<child>
<object class="GtkMenuButton" id="more-button">
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="menu-model">menu1</property>
<property name="relief">none</property>
@ -231,7 +224,6 @@ FAVORITES</property>
<child>
<object class="GtkButton" id="button5">
<property name="label" translatable="yes">Details</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="relief">none</property>
<style>

8
demos/gtk-demo/main.ui
View File

@ -34,7 +34,6 @@
<child>
<object class="GtkButton">
<property name="valign">center</property>
<property name="can-focus">1</property>
<property name="action-name">win.run</property>
<style>
<class name="text-button"/>
@ -62,12 +61,10 @@
<child>
<object class="GtkScrolledWindow">
<property name="width-request">120</property>
<property name="can-focus">1</property>
<property name="hscrollbar-policy">never</property>
<property name="min-content-width">150</property>
<child>
<object class="GtkTreeView" id="treeview">
<property name="can-focus">1</property>
<property name="model">treestore</property>
<property name="headers-visible">0</property>
<child internal-child="selection">
@ -99,7 +96,6 @@
</child>
<child>
<object class="GtkNotebook" id="notebook">
<property name="can-focus">1</property>
<property name="scrollable">1</property>
<property name="enable-popup">1</property>
<property name="show-border">0</property>
@ -110,10 +106,8 @@
<property name="tab-expand">1</property>
<property name="child">
<object class="GtkScrolledWindow">
<property name="can-focus">1</property>
<child>
<object class="GtkTextView" id="info-textview">
<property name="can-focus">1</property>
<property name="left-margin">20</property>
<property name="right-margin">20</property>
<property name="top-margin">20</property>
@ -141,10 +135,8 @@
<property name="tab-expand">1</property>
<property name="child">
<object class="GtkScrolledWindow" id="source-scrolledwindow">
<property name="can-focus">1</property>
<child>
<object class="GtkTextView" id="source-textview">
<property name="can-focus">1</property>
<property name="left-margin">20</property>
<property name="right-margin">20</property>
<property name="top-margin">20</property>

3
demos/gtk-demo/scale.ui
View File

@ -43,7 +43,6 @@
</child>
<child>
<object class="GtkScale" id="scale_plain">
<property name="can-focus">1</property>
<property name="width-request">200</property>
<property name="draw-value">0</property>
<property name="adjustment">adjustment1</property>
@ -72,7 +71,6 @@
</child>
<child>
<object class="GtkScale" id="scale_marks">
<property name="can-focus">1</property>
<property name="width-request">200</property>
<property name="draw-value">0</property>
<property name="adjustment">adjustment2</property>
@ -108,7 +106,6 @@
</child>
<child>
<object class="GtkScale" id="scale_discrete">
<property name="can-focus">1</property>
<property name="width-request">200</property>
<property name="round-digits">0</property>
<property name="draw-value">0</property>

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

@ -16,7 +16,6 @@
</child>
<child>
<object class="GtkStack" id="stack">
<property name="can-focus">1</property>
<property name="transition-type">crossfade</property>
<child>
<object class="GtkStackPage">
@ -38,7 +37,6 @@
<property name="child">
<object class="GtkCheckButton">
<property name="label" translatable="yes">Page 2</property>
<property name="can-focus">1</property>
<property name="halign">center</property>
<property name="valign">center</property>
</object>

3
demos/gtk-demo/themes.ui
View File

@ -28,21 +28,18 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">Hi, I am a button</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="label" translatable="yes">And I&apos;m another button</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="label" translatable="yes">This is a button party!</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
</object>
</child>

3
demos/gtk-demo/theming.ui
View File

@ -17,21 +17,18 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">Hi, I am a button</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="label" translatable="yes">And I&apos;m another button</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="label" translatable="yes">This is a button party!</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
</object>
</child>

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

@ -534,7 +534,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
</child>
<child>
<object class="GtkButton" id="button224">
<property name="can-focus">1</property>
<property name="icon-name">window-close-symbolic</property>
</object>
</child>
@ -625,14 +624,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<child>
<object class="GtkCheckButton" id="checkbutton1">
<property name="label" translatable="yes">checkbutton</property>
<property name="can-focus">1</property>
<property name="active">1</property>
</object>
</child>
<child>
<object class="GtkCheckButton" id="checkbutton2">
<property name="label" translatable="yes">checkbutton</property>
<property name="can-focus">1</property>
<layout>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
@ -643,7 +640,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<object class="GtkCheckButton" id="checkbutton3">
<property name="label" translatable="yes">checkbutton</property>
<property name="inconsistent">1</property>
<property name="can-focus">1</property>
<layout>
<property name="left-attach">0</property>
<property name="top-attach">2</property>
@ -654,7 +650,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<object class="GtkCheckButton" id="checkbutton4">
<property name="label" translatable="yes">checkbutton</property>
<property name="sensitive">0</property>
<property name="can-focus">1</property>
<property name="active">1</property>
<layout>
<property name="left-attach">0</property>
@ -666,7 +661,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<object class="GtkCheckButton" id="checkbutton5">
<property name="label" translatable="yes">checkbutton</property>
<property name="sensitive">0</property>
<property name="can-focus">1</property>
<layout>
<property name="left-attach">0</property>
<property name="top-attach">4</property>
@ -678,7 +672,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<property name="label" translatable="yes">checkbutton</property>
<property name="sensitive">0</property>
<property name="inconsistent">1</property>
<property name="can-focus">1</property>
<layout>
<property name="left-attach">0</property>
<property name="top-attach">5</property>
@ -688,7 +681,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<child>
<object class="GtkRadioButton" id="radiobutton1">
<property name="label" translatable="yes">radiobutton</property>
<property name="can-focus">1</property>
<property name="active">1</property>
<layout>
<property name="left-attach">0</property>
@ -699,7 +691,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<child>
<object class="GtkRadioButton" id="radiobutton2">
<property name="label" translatable="yes">radiobutton</property>
<property name="can-focus">1</property>
<property name="group">radiobutton1</property>
<layout>
<property name="left-attach">1</property>
@ -711,7 +702,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<object class="GtkRadioButton" id="radiobutton3">
<property name="label" translatable="yes">radiobutton</property>
<property name="inconsistent">1</property>
<property name="can-focus">1</property>
<property name="group">radiobutton1</property>
<layout>
<property name="left-attach">1</property>
@ -723,7 +713,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<object class="GtkRadioButton" id="radiobutton4">
<property name="label" translatable="yes">radiobutton</property>
<property name="sensitive">0</property>
<property name="can-focus">1</property>
<layout>
<property name="left-attach">1</property>
<property name="top-attach">3</property>
@ -734,7 +723,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<object class="GtkRadioButton" id="radiobutton5">
<property name="label" translatable="yes">radiobutton</property>
<property name="sensitive">0</property>
<property name="can-focus">1</property>
<property name="group">radiobutton3</property>
<layout>
<property name="left-attach">1</property>
@ -747,7 +735,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<property name="label" translatable="yes">radiobutton</property>
<property name="sensitive">0</property>
<property name="inconsistent">1</property>
<property name="can-focus">1</property>
<property name="group">radiobutton3</property>
<layout>
<property name="left-attach">1</property>
@ -806,7 +793,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<child>
<object class="GtkToggleButton" id="togglebutton1">
<property name="label" translatable="yes">togglebutton</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
</object>
</child>
@ -814,14 +800,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<object class="GtkToggleButton" id="togglebutton2">
<property name="label" translatable="yes">togglebutton</property>
<property name="sensitive">0</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
</object>
</child>
<child>
<object class="GtkToggleButton" id="togglebutton3">
<property name="label" translatable="yes">togglebutton</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="active">1</property>
</object>
@ -830,7 +814,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<object class="GtkToggleButton" id="togglebutton4">
<property name="label" translatable="yes">togglebutton</property>
<property name="sensitive">0</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="active">1</property>
</object>
@ -862,14 +845,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
</child>
<child>
<object class="GtkFontButton" id="fontbutton1">
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="level">family|style|size|features|variations</property>
</object>
</child>
<child>
<object class="GtkColorButton" id="colorbutton1">
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="rgba">#31316867a09f</property>
<property name="use-alpha">1</property>
@ -881,7 +862,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<child>
<object class="GtkLinkButton" id="linkbutton1">
<property name="label" translatable="yes">link button</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="has-tooltip">1</property>
<property name="relief">none</property>
@ -960,7 +940,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<property name="homogeneous">1</property>
<child>
<object class="GtkScale" id="scale1">
<property name="can-focus">1</property>
<property name="adjustment">adjustment1</property>
<property name="restrict-to-fill-level">0</property>
<property name="fill-level">75</property>
@ -970,7 +949,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<child>
<object class="GtkScale" id="scale2">
<property name="sensitive">0</property>
<property name="can-focus">1</property>
<property name="adjustment">adjustment1</property>
<property name="restrict-to-fill-level">0</property>
<property name="fill-level">75</property>
@ -983,7 +961,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
</child>
<child>
<object class="GtkScale" id="scale5">
<property name="can-focus">1</property>
<property name="draw-value">0</property>
<property name="has-origin">0</property>
<property name="round-digits">0</property>
@ -1031,7 +1008,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<child>
<object class="GtkScale" id="scale3">
<property name="height-request">100</property>
<property name="can-focus">1</property>
<property name="orientation">vertical</property>
<property name="adjustment">adjustment1</property>
<property name="restrict-to-fill-level">0</property>
@ -1044,7 +1020,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<object class="GtkScale" id="scale4">
<property name="height-request">100</property>
<property name="sensitive">0</property>
<property name="can-focus">1</property>
<property name="orientation">vertical</property>
<property name="adjustment">adjustment1</property>
<property name="restrict-to-fill-level">0</property>
@ -1137,13 +1112,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="width-request">150</property>
<property name="can-focus">1</property>
<property name="vscrollbar-policy">always</property>
<property name="shadow-type">in</property>
<property name="vexpand">1</property>
<child>
<object class="GtkTreeView" id="treeview1">
<property name="can-focus">1</property>
<property name="model">liststore1</property>
<property name="headers-clickable">0</property>
<property name="search-column">0</property>
@ -1214,12 +1187,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="can-focus">1</property>
<property name="shadow-type">in</property>
<property name="vexpand">1</property>
<child>
<object class="GtkTextView" id="textview1">
<property name="can-focus">1</property>
<property name="buffer">textbuffer1</property>
<property name="wrap-mode">2</property>
<property name="left-margin">10</property>
@ -1241,7 +1212,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<property name="homogeneous">1</property>
<child>
<object class="GtkNotebook" id="notebook1">
<property name="can-focus">1</property>
<child>
<object class="GtkNotebookPage">
<property name="child">
@ -1289,7 +1259,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
</child>
<child>
<object class="GtkNotebook" id="notebook2">
<property name="can-focus">1</property>
<property name="tab-pos">right</property>
<child>
<object class="GtkNotebookPage">
@ -1339,7 +1308,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
</child>
<child>
<object class="GtkNotebook" id="notebook3">
<property name="can-focus">1</property>
<property name="tab-pos">bottom</property>
<child>
<object class="GtkNotebookPage">
@ -1389,7 +1357,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
</child>
<child>
<object class="GtkNotebook" id="notebook4">
<property name="can-focus">1</property>
<property name="tab-pos">left</property>
<child>
<object class="GtkNotebookPage">
@ -1577,7 +1544,6 @@ microphone-sensitivity-medium-symbolic</property>
<property name="hscrollbar-policy">never</property>
<child>
<object class="GtkTextView" id="tvo">
<property name="can-focus">1</property>
<property name="buffer">textbuffer2</property>
<property name="left-margin">10</property>
<property name="right-margin">10</property>
@ -1928,7 +1894,6 @@ microphone-sensitivity-medium-symbolic</property>
<child>
<object class="MyTextView" id="text3">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="buffer">textbuffer1</property>
<property name="wrap-mode">2</property>
<property name="left-margin">10</property>
@ -2029,20 +1994,17 @@ microphone-sensitivity-medium-symbolic</property>
</child>
<child>
<object class="GtkExpander" id="expander1">
<property name="can-focus">1</property>
<property name="expanded">1</property>
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow3">
<property name="can-focus">1</property>
<property name="shadow-type">in</property>
<property name="margin-top">6</property>
<property name="height-request">226</property>
<child>
<object class="GtkIconView" id="iconview1">
<property name="can-focus">1</property>
<property name="selection-mode">multiple</property>
<property name="model">iconsmodel</property>
<child>

2
gtk/gtkcolorbutton.c
View File

@ -265,6 +265,8 @@ gtk_color_button_init (GtkColorButton *button)
gtk_widget_set_parent (priv->button, GTK_WIDGET (button));
priv->swatch = gtk_color_swatch_new ();
gtk_widget_set_can_focus (priv->swatch, FALSE);
g_object_set (priv->swatch, "has-menu", FALSE, NULL);
layout = gtk_widget_create_pango_layout (GTK_WIDGET (button), "Black");
pango_layout_get_pixel_extents (layout, NULL, &rect);
g_object_unref (layout);

1
testsuite/gtk/focus-chain/widget-factory.tab
View File

@ -16,7 +16,6 @@ GtkToggleButton
GtkToggleButton
GtkButton
GtkButton
GtkColorSwatch
GtkButton
GtkLinkButton
GtkSwitch