mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-12 20:00:09 +00:00
Merge branch 'window-activate' into 'master'
a11y: restore window:activate/deactivate emission Closes #127 See merge request GNOME/gtk!77
This commit is contained in:
commit
8cb0df7554
@ -23,10 +23,13 @@
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
void _gtk_accessibility_init (void);
|
||||
void _gtk_accessibility_init (void);
|
||||
|
||||
gboolean _gtk_accessibility_key_snooper (GtkWidget *widget,
|
||||
GdkEventKey *event);
|
||||
gboolean _gtk_accessibility_key_snooper (GtkWidget *widget,
|
||||
GdkEventKey *event);
|
||||
|
||||
void _gtk_window_accessible_set_is_active (GtkWindow *window,
|
||||
gboolean is_active);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
|
@ -20,9 +20,11 @@
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include "gtkaccessibility.h"
|
||||
#include "gtkwidgetaccessibleprivate.h"
|
||||
#include "gtkwindowaccessible.h"
|
||||
#include "gtktoplevelaccessible.h"
|
||||
#include "gtkwidgetprivate.h"
|
||||
#include "gtkwindowprivate.h"
|
||||
|
||||
/* atkcomponent.h */
|
||||
@ -442,6 +444,19 @@ gtk_window_accessible_get_size (AtkComponent *component,
|
||||
*height = rect.height;
|
||||
}
|
||||
|
||||
void
|
||||
_gtk_window_accessible_set_is_active (GtkWindow *window,
|
||||
gboolean is_active)
|
||||
{
|
||||
AtkObject *accessible = _gtk_widget_peek_accessible (GTK_WIDGET (window));
|
||||
|
||||
if (accessible == NULL)
|
||||
return;
|
||||
|
||||
g_signal_emit_by_name (accessible, is_active ? "activate" : "deactivate");
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
atk_component_interface_init (AtkComponentIface *iface)
|
||||
{
|
||||
|
@ -10461,6 +10461,7 @@ _gtk_window_set_is_active (GtkWindow *window,
|
||||
}
|
||||
|
||||
g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_IS_ACTIVE]);
|
||||
_gtk_window_accessible_set_is_active (window, is_active);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user