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 
Docs: Tweaks

Closes #3638

See merge request GNOME/gtk!3639
This commit is contained in:
Matthias Clasen 2021-06-05 22:13:21 +00:00
commit fca19e72ad
9 changed files with 93 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/reference/gtk/migrating-3to4.md
View File

@ -604,6 +604,9 @@ from `FALSE` to `TRUE`. In addition, there is a [property@Gtk.Widget:focusable]
property, which controls whether an individual widget can receive
the input focus.
The `gtk4-builder-tool` utility, when called with the `--3to4` option of the
`simplify` command, will replace `:can-focus` by `:focusable`.
The feature to automatically keep the focus widget scrolled into view with
`gtk_container_set_focus_vadjustment()` has been removed together with
`GtkContainer`, and is provided by scrollable widgets instead. In the common

5
gdk/gdk.c
View File

@ -330,14 +330,13 @@ gdk_display_open_default (void)
}
/*< private >
*
* gdk_get_startup_notification_id
* gdk_get_startup_notification_id:
*
* Returns the original value of the DESKTOP_STARTUP_ID environment
* variable if it was defined and valid, or %NULL otherwise.
*
* Returns: (nullable) (transfer none): the original value of the
* DESKTOP_STARTUP_ID environment variable, or %NULL.
* DESKTOP_STARTUP_ID environment variable
*/
const char *
gdk_get_startup_notification_id (void)

2
gdk/gdkcursor.c
View File

@ -340,7 +340,7 @@ gdk_cursor_new_from_name (const char *name,
* @texture: the texture providing the pixel data
* @hotspot_x: the horizontal offset of the “hotspot” of the cursor
* @hotspot_y: the vertical offset of the “hotspot” of the cursor
* @fallback: (nullable): %NULL or the `GdkCursor` to fall back to when
* @fallback: (nullable): the `GdkCursor` to fall back to when
* this one cannot be supported
*
* Creates a new cursor from a `GdkTexture`.

8
gdk/gdkdisplay.c
View File

@ -384,11 +384,11 @@ gdk_display_is_closed (GdkDisplay *display)
* gdk_display_get_event:
* @display: a `GdkDisplay`
*
* Gets the next `GdkEvent` to be processed for @display, fetching events from the
* windowing system if necessary.
* Gets the next `GdkEvent` to be processed for @display,
* fetching events from the windowing system if necessary.
*
* Returns: (nullable) (transfer full): the next `GdkEvent` to be processed,
* or %NULL if no events are pending
* Returns: (nullable) (transfer full): the next `GdkEvent`
* to be processed
*/
GdkEvent *
gdk_display_get_event (GdkDisplay *display)

3
gdk/gdkdisplaymanager.c
View File

@ -323,7 +323,8 @@ gdk_display_manager_get_default_display (GdkDisplayManager *manager)
* Gets the default `GdkDisplay`.
*
* This is a convenience function for:
* `gdk_display_manager_get_default_display (gdk_display_manager_get ())`.
*
* gdk_display_manager_get_default_display (gdk_display_manager_get ())
*
* Returns: (nullable) (transfer none): a `GdkDisplay`, or %NULL if
* there is no default display

6
gdk/gdkframeclock.c
View File

@ -481,11 +481,11 @@ _gdk_frame_clock_begin_frame (GdkFrameClock *frame_clock)
* for the current frame or a recent frame.
*
* The `GdkFrameTimings` object may not yet be complete: see
* [method@Gdk.FrameTimings.get_complete].
* [method@Gdk.FrameTimings.get_complete] and
* [method@Gdk.FrameClock.get_history_start].
*
* Returns: (nullable) (transfer none): the `GdkFrameTimings` object
* for the specified frame, or %NULL if it is not available. See
* [method@Gdk.FrameClock.get_history_start].
* for the specified frame, or %NULL if it is not available
*/
GdkFrameTimings *
gdk_frame_clock_get_timings (GdkFrameClock *frame_clock,

78
testsuite/tools/simplify-data-3to4/box.expected
View File

@ -4,15 +4,12 @@
<object class="GtkWindow">
<property name="child">
<object class="GtkBox">
<property name="can_focus">0</property>
<child>
<object class="GtkBox">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox">
<property name="can_focus">0</property>
<property name="valign">center</property>
<property name="hexpand">1</property>
<property name="vexpand">0</property>
@ -20,12 +17,14 @@
<object class="GtkButton">
<property name="halign">center</property>
<property name="label" translatable="yes">_</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="label" translatable="yes">F</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
</object>
</child>
@ -34,6 +33,7 @@
<property name="halign">center</property>
<property name="hexpand">1</property>
<property name="label" translatable="yes">E</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
</object>
</child>
@ -41,6 +41,7 @@
<object class="GtkButton">
<property name="hexpand">1</property>
<property name="label" translatable="yes">FE</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
</object>
</child>
@ -56,12 +57,14 @@
<object class="GtkButton">
<property name="halign">center</property>
<property name="label" translatable="yes">_</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="label" translatable="yes">F</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
</object>
</child>
@ -70,6 +73,7 @@
<property name="halign">center</property>
<property name="hexpand">1</property>
<property name="label" translatable="yes">E</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
</object>
</child>
@ -77,6 +81,7 @@
<object class="GtkButton">
<property name="hexpand">1</property>
<property name="label" translatable="yes">FE</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
</object>
</child>
@ -94,12 +99,14 @@
<object class="GtkButton">
<property name="valign">center</property>
<property name="label" translatable="yes">_</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="label" translatable="yes">F</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
</object>
</child>
@ -108,6 +115,7 @@
<property name="valign">center</property>
<property name="vexpand">1</property>
<property name="label" translatable="yes">E</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
</object>
</child>
@ -115,6 +123,7 @@
<object class="GtkButton">
<property name="vexpand">1</property>
<property name="label" translatable="yes">FE</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
</object>
</child>
@ -122,7 +131,6 @@
</child>
<child>
<object class="GtkBox">
<property name="can_focus">0</property>
<property name="hexpand">0</property>
<property name="vexpand">1</property>
<property name="orientation">vertical</property>
@ -130,12 +138,14 @@
<object class="GtkButton">
<property name="valign">center</property>
<property name="label" translatable="yes">_I</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FI</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
</object>
</child>
@ -144,6 +154,7 @@
<property name="valign">center</property>
<property name="vexpand">1</property>
<property name="label" translatable="yes">EI</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
</object>
</child>
@ -151,12 +162,14 @@
<object class="GtkButton">
<property name="vexpand">1</property>
<property name="label" translatable="yes">FEI</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="label" translatable="yes">_S</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
</object>
@ -164,6 +177,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FS</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">start</property>
</object>
@ -172,6 +186,7 @@
<object class="GtkButton">
<property name="vexpand">1</property>
<property name="label" translatable="yes">ES</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
</object>
@ -180,6 +195,7 @@
<object class="GtkButton">
<property name="vexpand">1</property>
<property name="label" translatable="yes">FES</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">start</property>
</object>
@ -187,6 +203,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">_N</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
</object>
@ -194,6 +211,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FN</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">end</property>
</object>
@ -202,6 +220,7 @@
<object class="GtkButton">
<property name="vexpand">1</property>
<property name="label" translatable="yes">EN</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
</object>
@ -210,6 +229,7 @@
<object class="GtkButton">
<property name="vexpand">1</property>
<property name="label" translatable="yes">FEN</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">end</property>
</object>
@ -217,6 +237,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">_C</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
</object>
@ -224,6 +245,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FC</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
</object>
@ -232,6 +254,7 @@
<object class="GtkButton">
<property name="vexpand">1</property>
<property name="label" translatable="yes">EC</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
</object>
@ -240,6 +263,7 @@
<object class="GtkButton">
<property name="vexpand">1</property>
<property name="label" translatable="yes">FEC</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
</object>
@ -247,6 +271,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">_B</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
</object>
@ -254,6 +279,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FB</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">baseline</property>
</object>
@ -262,6 +288,7 @@
<object class="GtkButton">
<property name="vexpand">1</property>
<property name="label" translatable="yes">EB</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
</object>
@ -270,6 +297,7 @@
<object class="GtkButton">
<property name="vexpand">1</property>
<property name="label" translatable="yes">FEB</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">baseline</property>
</object>
@ -278,7 +306,6 @@
</child>
<child>
<object class="GtkBox">
<property name="can_focus">0</property>
<property name="hexpand">0</property>
<property name="vexpand">1</property>
<property name="orientation">vertical</property>
@ -286,6 +313,7 @@
<object class="GtkButton">
<property name="valign">center</property>
<property name="label" translatable="yes">_I</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="vexpand">0</property>
</object>
@ -293,6 +321,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FI</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="vexpand">0</property>
</object>
@ -301,6 +330,7 @@
<object class="GtkButton">
<property name="valign">center</property>
<property name="label" translatable="yes">EI</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="vexpand">1</property>
</object>
@ -308,6 +338,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FEI</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="vexpand">1</property>
</object>
@ -315,6 +346,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">_S</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
<property name="vexpand">0</property>
@ -323,6 +355,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FS</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">start</property>
<property name="vexpand">0</property>
@ -331,6 +364,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">ES</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
<property name="vexpand">1</property>
@ -339,6 +373,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FES</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">start</property>
<property name="vexpand">1</property>
@ -347,6 +382,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">_N</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
<property name="vexpand">0</property>
@ -355,6 +391,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FN</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">end</property>
<property name="vexpand">0</property>
@ -363,6 +400,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">EN</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
<property name="vexpand">1</property>
@ -371,6 +409,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FEN</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">end</property>
<property name="vexpand">1</property>
@ -379,6 +418,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">_C</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
<property name="vexpand">0</property>
@ -387,6 +427,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FC</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
<property name="vexpand">0</property>
@ -395,6 +436,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">EC</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
<property name="vexpand">1</property>
@ -403,6 +445,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FEC</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
<property name="vexpand">1</property>
@ -411,6 +454,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">_B</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
<property name="vexpand">0</property>
@ -419,6 +463,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FB</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">baseline</property>
<property name="vexpand">0</property>
@ -427,6 +472,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">EB</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
<property name="vexpand">1</property>
@ -435,6 +481,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FEB</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">baseline</property>
<property name="vexpand">1</property>
@ -444,7 +491,6 @@
</child>
<child>
<object class="GtkBox">
<property name="can_focus">0</property>
<property name="hexpand">0</property>
<property name="vexpand">1</property>
<property name="orientation">vertical</property>
@ -452,6 +498,7 @@
<object class="GtkButton">
<property name="valign">center</property>
<property name="label" translatable="yes">_I</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="vexpand">1</property>
</object>
@ -459,6 +506,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FI</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="vexpand">1</property>
</object>
@ -467,6 +515,7 @@
<object class="GtkButton">
<property name="valign">center</property>
<property name="label" translatable="yes">EI</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="vexpand">1</property>
</object>
@ -474,6 +523,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FEI</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="vexpand">1</property>
</object>
@ -481,6 +531,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">_S</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
<property name="vexpand">1</property>
@ -489,6 +540,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FS</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">start</property>
<property name="vexpand">1</property>
@ -497,6 +549,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">ES</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
<property name="vexpand">1</property>
@ -505,6 +558,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FES</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">start</property>
<property name="vexpand">1</property>
@ -513,6 +567,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">_N</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
<property name="vexpand">1</property>
@ -521,6 +576,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FN</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">end</property>
<property name="vexpand">1</property>
@ -529,6 +585,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">EN</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
<property name="vexpand">1</property>
@ -537,6 +594,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FEN</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">end</property>
<property name="vexpand">1</property>
@ -545,6 +603,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">_C</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
<property name="vexpand">1</property>
@ -553,6 +612,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FC</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
<property name="vexpand">1</property>
@ -561,6 +621,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">EC</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
<property name="vexpand">1</property>
@ -569,6 +630,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FEC</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
<property name="vexpand">1</property>
@ -577,6 +639,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">_B</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
<property name="vexpand">1</property>
@ -585,6 +648,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FB</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">baseline</property>
<property name="vexpand">1</property>
@ -593,6 +657,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">EB</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">center</property>
<property name="vexpand">1</property>
@ -601,6 +666,7 @@
<child>
<object class="GtkButton">
<property name="label" translatable="yes">FEB</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="valign">baseline</property>
<property name="vexpand">1</property>

5
testsuite/tools/simplify-data-3to4/grid.expected
View File

@ -67,6 +67,7 @@
<child>
<object class="GtkSwitch" id="button5">
<property name="active">1</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
<layout>
<property name="column">4</property>
@ -76,6 +77,7 @@
</child>
<child>
<object class="GtkSwitch" id="button6">
<property name="focusable">1</property>
<property name="receives_default">1</property>
<layout>
<property name="column">5</property>
@ -85,6 +87,7 @@
</child>
<child>
<object class="GtkButton" id="button7">
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="label">Text Button</property>
<layout>
@ -95,6 +98,7 @@
</child>
<child>
<object class="GtkButton" id="button8">
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="halign">center</property>
<property name="valign">center</property>
@ -106,6 +110,7 @@
</child>
<child>
<object class="GtkButton" id="button9">
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="halign">center</property>
<property name="valign">center</property>

1
tools/gtk-builder-tool-simplify.c
View File

@ -721,6 +721,7 @@ maybe_rename_property (Element *element, MyParserData *data)
{ "GtkHeaderBar", "custom-title", GTK_TYPE_HEADER_BAR, PROP_KIND_OBJECT, "title-widget", { NULL, NULL, NULL } },
{ "GtkStack", "homogeneous", GTK_TYPE_STACK, PROP_KIND_OBJECT, "hhomogeneous", { "vhomogeneous", NULL, NULL } },
{ "GtkImage", "pixbuf", GTK_TYPE_IMAGE, PROP_KIND_OBJECT, "file", { NULL, NULL, NULL } },
{ "GtkWidget", "can-focus", GTK_TYPE_WIDGET, PROP_KIND_OBJECT, "focusable", { NULL, NULL, NULL } },
};
int i, k, l;
PropKind kind;