forked from AuroraMiddleware/gtk
gtk/window: Add 'fullscreen' prop and gtk_window_is_fullscreen()
This makes it possible to set 'fullscreen' to 'true' in a .ui file to start an application in fullscreen mode.
This commit is contained in:
parent
eb0eac0f03
commit
2e5eeb6b92
@ -285,6 +285,7 @@ enum {
|
|||||||
PROP_FOCUS_VISIBLE,
|
PROP_FOCUS_VISIBLE,
|
||||||
|
|
||||||
PROP_MAXIMIZED,
|
PROP_MAXIMIZED,
|
||||||
|
PROP_FULLSCREEN,
|
||||||
|
|
||||||
LAST_ARG
|
LAST_ARG
|
||||||
};
|
};
|
||||||
@ -869,6 +870,13 @@ gtk_window_class_init (GtkWindowClass *klass)
|
|||||||
FALSE,
|
FALSE,
|
||||||
GTK_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_EXPLICIT_NOTIFY);
|
GTK_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_EXPLICIT_NOTIFY);
|
||||||
|
|
||||||
|
window_props[PROP_FULLSCREEN] =
|
||||||
|
g_param_spec_boolean ("fullscreen",
|
||||||
|
P_("Is fullscreen"),
|
||||||
|
P_("Whether the window is fullscreen"),
|
||||||
|
FALSE,
|
||||||
|
GTK_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_EXPLICIT_NOTIFY);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* GtkWindow:application:
|
* GtkWindow:application:
|
||||||
*
|
*
|
||||||
@ -1111,6 +1119,36 @@ gtk_window_is_maximized (GtkWindow *window)
|
|||||||
return priv->maximize_initially;
|
return priv->maximize_initially;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* gtk_window_is_fullscreen:
|
||||||
|
* @window: a #GtkWindow
|
||||||
|
*
|
||||||
|
* Retrieves the current fullscreen state of @window.
|
||||||
|
*
|
||||||
|
* Note that since fullscreening is ultimately handled by the window
|
||||||
|
* manager and happens asynchronously to an application request, you
|
||||||
|
* shouldn’t assume the return value of this function changing
|
||||||
|
* immediately (or at all), as an effect of calling
|
||||||
|
* gtk_window_fullscreen() or gtk_window_unfullscreen().
|
||||||
|
*
|
||||||
|
* If the window isn't yet mapped, the value returned will whether the
|
||||||
|
* initial requested state is fullscreen.
|
||||||
|
*
|
||||||
|
* Returns: whether the window has a fullscreen state.
|
||||||
|
*/
|
||||||
|
gboolean
|
||||||
|
gtk_window_is_fullscreen (GtkWindow *window)
|
||||||
|
{
|
||||||
|
GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
|
||||||
|
|
||||||
|
g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
|
||||||
|
|
||||||
|
if (priv->surface && gdk_surface_get_mapped (priv->surface))
|
||||||
|
return priv->fullscreen;
|
||||||
|
else
|
||||||
|
return priv->fullscreen_initially;
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
_gtk_window_toggle_maximized (GtkWindow *window)
|
_gtk_window_toggle_maximized (GtkWindow *window)
|
||||||
{
|
{
|
||||||
@ -1625,6 +1663,12 @@ gtk_window_set_property (GObject *object,
|
|||||||
else
|
else
|
||||||
gtk_window_unmaximize (window);
|
gtk_window_unmaximize (window);
|
||||||
break;
|
break;
|
||||||
|
case PROP_FULLSCREEN:
|
||||||
|
if (g_value_get_boolean (value))
|
||||||
|
gtk_window_fullscreen (window);
|
||||||
|
else
|
||||||
|
gtk_window_unfullscreen (window);
|
||||||
|
break;
|
||||||
case PROP_FOCUS_WIDGET:
|
case PROP_FOCUS_WIDGET:
|
||||||
gtk_window_set_focus (window, g_value_get_object (value));
|
gtk_window_set_focus (window, g_value_get_object (value));
|
||||||
break;
|
break;
|
||||||
@ -1702,6 +1746,9 @@ gtk_window_get_property (GObject *object,
|
|||||||
case PROP_MAXIMIZED:
|
case PROP_MAXIMIZED:
|
||||||
g_value_set_boolean (value, gtk_window_is_maximized (window));
|
g_value_set_boolean (value, gtk_window_is_maximized (window));
|
||||||
break;
|
break;
|
||||||
|
case PROP_FULLSCREEN:
|
||||||
|
g_value_set_boolean (value, gtk_window_is_fullscreen (window));
|
||||||
|
break;
|
||||||
case PROP_FOCUS_WIDGET:
|
case PROP_FOCUS_WIDGET:
|
||||||
g_value_set_object (value, gtk_window_get_focus (window));
|
g_value_set_object (value, gtk_window_get_focus (window));
|
||||||
break;
|
break;
|
||||||
@ -4425,6 +4472,8 @@ surface_state_changed (GtkWidget *widget)
|
|||||||
{
|
{
|
||||||
priv->fullscreen = (new_surface_state & GDK_TOPLEVEL_STATE_FULLSCREEN) ? TRUE : FALSE;
|
priv->fullscreen = (new_surface_state & GDK_TOPLEVEL_STATE_FULLSCREEN) ? TRUE : FALSE;
|
||||||
priv->fullscreen_initially = priv->fullscreen;
|
priv->fullscreen_initially = priv->fullscreen;
|
||||||
|
|
||||||
|
g_object_notify_by_pspec (G_OBJECT (widget), window_props[PROP_FULLSCREEN]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (changed_mask & GDK_TOPLEVEL_STATE_MAXIMIZED)
|
if (changed_mask & GDK_TOPLEVEL_STATE_MAXIMIZED)
|
||||||
@ -5195,12 +5244,17 @@ void
|
|||||||
gtk_window_fullscreen (GtkWindow *window)
|
gtk_window_fullscreen (GtkWindow *window)
|
||||||
{
|
{
|
||||||
GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
|
GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
|
||||||
|
gboolean was_fullscreen_initially;
|
||||||
|
|
||||||
g_return_if_fail (GTK_IS_WINDOW (window));
|
g_return_if_fail (GTK_IS_WINDOW (window));
|
||||||
|
|
||||||
|
was_fullscreen_initially = priv->fullscreen_initially;
|
||||||
priv->fullscreen_initially = TRUE;
|
priv->fullscreen_initially = TRUE;
|
||||||
|
|
||||||
gtk_window_update_toplevel (window);
|
if (priv->surface && gdk_surface_get_mapped (priv->surface))
|
||||||
|
gtk_window_update_toplevel (window);
|
||||||
|
else if (!was_fullscreen_initially)
|
||||||
|
g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_FULLSCREEN]);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -5267,13 +5321,20 @@ void
|
|||||||
gtk_window_unfullscreen (GtkWindow *window)
|
gtk_window_unfullscreen (GtkWindow *window)
|
||||||
{
|
{
|
||||||
GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
|
GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
|
||||||
|
gboolean was_fullscreen_initially;
|
||||||
|
|
||||||
g_return_if_fail (GTK_IS_WINDOW (window));
|
g_return_if_fail (GTK_IS_WINDOW (window));
|
||||||
|
|
||||||
|
was_fullscreen_initially = priv->fullscreen_initially;
|
||||||
unset_fullscreen_monitor (window);
|
unset_fullscreen_monitor (window);
|
||||||
priv->fullscreen_initially = FALSE;
|
priv->fullscreen_initially = FALSE;
|
||||||
|
|
||||||
gtk_window_update_toplevel (window);
|
gtk_window_update_toplevel (window);
|
||||||
|
|
||||||
|
if (priv->surface && gdk_surface_get_mapped (priv->surface))
|
||||||
|
gtk_window_update_toplevel (window);
|
||||||
|
else if (was_fullscreen_initially)
|
||||||
|
g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_FULLSCREEN]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -247,6 +247,9 @@ GtkWidget *gtk_window_get_titlebar (GtkWindow *window);
|
|||||||
GDK_AVAILABLE_IN_ALL
|
GDK_AVAILABLE_IN_ALL
|
||||||
gboolean gtk_window_is_maximized (GtkWindow *window);
|
gboolean gtk_window_is_maximized (GtkWindow *window);
|
||||||
|
|
||||||
|
GDK_AVAILABLE_IN_ALL
|
||||||
|
gboolean gtk_window_is_fullscreen (GtkWindow *window);
|
||||||
|
|
||||||
GDK_AVAILABLE_IN_ALL
|
GDK_AVAILABLE_IN_ALL
|
||||||
void gtk_window_destroy (GtkWindow *window);
|
void gtk_window_destroy (GtkWindow *window);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user