brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving setting of window-scaling-factor to meta_clutter_init()

Browse Source 
Setting the scaling factor immediately after calling clutter_init()
avoids creating the stage at one size, then later resizing it to
a different size.

https://bugzilla.gnome.org/show_bug.cgi?id=736279
This commit is contained in:
Owen W. Taylor 2014-09-08 14:17:03 -04:00
parent 602dd7fdf2
commit 33689ec558
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backends/meta-backend.c
View File

@ -454,6 +454,7 @@ static GSourceFuncs event_funcs = {
void void
meta_clutter_init (void) meta_clutter_init (void)
{ {
ClutterSettings *clutter_settings;
GSource *source; GSource *source;
meta_create_backend (); meta_create_backend ();
@ -461,6 +462,13 @@ meta_clutter_init (void)
if (clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS) if (clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
g_error ("Unable to initialize Clutter.\n"); g_error ("Unable to initialize Clutter.\n");
/*
* XXX: We cannot handle high dpi scaling yet, so fix the scale to 1
* for now.
*/
clutter_settings = clutter_settings_get_default ();
g_object_set (clutter_settings, "window-scaling-factor", 1, NULL);
source = g_source_new (&event_funcs, sizeof (GSource)); source = g_source_new (&event_funcs, sizeof (GSource));
g_source_attach (source, NULL); g_source_attach (source, NULL);
g_source_unref (source); g_source_unref (source);

8
src/core/main.c
View File

@ -302,7 +302,6 @@ meta_init (void)
{ {
struct sigaction act; struct sigaction act;
sigset_t empty_mask; sigset_t empty_mask;
ClutterSettings *clutter_settings;
sigemptyset (&empty_mask); sigemptyset (&empty_mask);
act.sa_handler = SIG_IGN; act.sa_handler = SIG_IGN;
@ -377,13 +376,6 @@ meta_init (void)
meta_ui_init (); meta_ui_init ();
meta_restart_init (); meta_restart_init ();
/*
* XXX: We cannot handle high dpi scaling yet, so fix the scale to 1
* for now.
*/
clutter_settings = clutter_settings_get_default ();
g_object_set (clutter_settings, "window-scaling-factor", 1, NULL);
} }
/** /**