We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent af71a8e commit 3a8367fCopy full SHA for 3a8367f
11 files changed
src/core/startup-notification.c
@@ -62,6 +62,7 @@ enum
62
enum
63
{
64
SEQ_COMPLETE,
65
+ SEQ_TIMEOUT,
66
N_SEQ_SIGNALS
67
};
68
@@ -268,6 +269,13 @@ meta_startup_sequence_class_init (MetaStartupSequenceClass *klass)
268
269
NULL, NULL, NULL,
270
G_TYPE_NONE, 0);
271
272
+ seq_signals[SEQ_TIMEOUT] =
273
+ g_signal_new ("timeout",
274
+ META_TYPE_STARTUP_SEQUENCE,
275
+ G_SIGNAL_RUN_LAST,
276
+ 0, NULL, NULL, NULL,
277
+ G_TYPE_NONE, 0);
278
+
279
seq_props[PROP_SEQ_ID] =
280
g_param_spec_string ("id",
281
"ID",
@@ -488,7 +496,11 @@ startup_sequence_timeout (void *data)
488
496
"Timed out sequence %s\n",
489
497
meta_startup_sequence_get_id (sequence));
490
498
491
- meta_startup_sequence_complete (sequence);
499
+ if (!meta_startup_sequence_get_completed (sequence))
500
+ {
501
+ g_signal_emit (sequence, seq_signals[SEQ_TIMEOUT], 0, sequence);
502
+ meta_startup_sequence_complete (sequence);
503
+ }
492
504
meta_startup_notification_remove_sequence (sn, sequence);
493
505
}
494
506
src/core/window.c
@@ -5578,6 +5578,13 @@ meta_window_raise (MetaWindow *window)
5578
5579
g_return_if_fail (!window->override_redirect);
5580
5581
+ /* Flush pending visible state now.
5582
+ * It is important that this runs before meta_stack_raise() because
5583
+ * showing a window may overwrite its stacking order based on the
5584
+ * stacking rules for newly shown windows.
5585
+ */
5586
+ meta_window_flush_calc_showing (window);
5587
5588
ancestor = meta_window_find_root_ancestor (window);
5589
5590
meta_topic (META_DEBUG_WINDOW_OPS,
src/meson.build
@@ -489,6 +489,8 @@ if have_wayland
'wayland/meta-pointer-lock-wayland.h',
'wayland/meta-selection-source-wayland.c',
'wayland/meta-selection-source-wayland-private.h',
+ 'wayland/meta-wayland-activation.c',
+ 'wayland/meta-wayland-activation.h',
'wayland/meta-wayland-actor-surface.c',
495
'wayland/meta-wayland-actor-surface.h',
'wayland/meta-wayland-buffer.c',
@@ -806,6 +808,7 @@ if have_wayland
806
808
['tablet', 'unstable', 'v2', ],
807
809
['text-input', 'unstable', 'v3', ],
810
['viewporter', 'stable', ],
811
+ ['xdg-activation', 'staging', 'v1', ],
812
['xdg-dialog', 'staging', 'v1', ],
813
['xdg-foreign', 'unstable', 'v1', ],
814
['xdg-foreign', 'unstable', 'v2', ],
0 commit comments