wayland: Set default title in toplevel_init()

This commit is contained in:
Benjamin Otte 2023-04-21 22:10:00 +02:00
parent f2083d36a1
commit 03d7ce3287
2 changed files with 16 additions and 15 deletions

View File

@ -107,20 +107,6 @@ fill_presentation_time_from_frame_time (GdkFrameTimings *timings,
}
}
static const char *
get_default_title (void)
{
const char *title;
title = g_get_application_name ();
if (!title)
title = g_get_prgname ();
if (!title)
title = "";
return title;
}
static gboolean
is_realized_shell_surface (GdkWaylandSurface *impl)
{
@ -868,7 +854,6 @@ gdk_wayland_display_create_surface (GdkDisplay *display,
g_warn_if_fail (parent == NULL);
surface = g_object_new (GDK_TYPE_WAYLAND_TOPLEVEL,
"display", display,
"title", get_default_title (),
NULL);
break;
case GDK_SURFACE_POPUP:

View File

@ -823,6 +823,20 @@ gdk_wayland_surface_create_xdg_toplevel (GdkWaylandToplevel *wayland_toplevel)
wl_surface_commit (wayland_surface->display_server.wl_surface);
}
static const char *
get_default_title (void)
{
const char *title;
title = g_get_application_name ();
if (!title)
title = g_get_prgname ();
if (!title)
title = "";
return title;
}
static void
gdk_wayland_toplevel_init (GdkWaylandToplevel *toplevel)
{
@ -830,6 +844,8 @@ gdk_wayland_toplevel_init (GdkWaylandToplevel *toplevel)
toplevel->shortcuts_inhibitors = g_hash_table_new (NULL, NULL);
toplevel->saved_width = -1;
toplevel->saved_height = -1;
toplevel->title = g_strdup (get_default_title ());
}
static void