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

compositor: Replace \r\n with \n

Browse Source 
Zed Editor, wasn't supported editorconfig yet, causing a mess
in some of my previous commits. Fix that

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3979>
This commit is contained in:
Bilal Elmoussaoui 2024-08-29 15:34:09 +02:00 committed by Marge Bot
parent 43295b80aa
commit 926d041f84
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/compositor/compositor.c
View File

@ -334,11 +334,11 @@ meta_compositor_manage (MetaCompositor *compositor,
compositor); compositor);
priv->window_group = meta_window_group_new (display); priv->window_group = meta_window_group_new (display);
clutter_actor_set_accessible_name (priv->window_group, "Window group"); clutter_actor_set_accessible_name (priv->window_group, "Window group");
priv->top_window_group = meta_window_group_new (display); priv->top_window_group = meta_window_group_new (display);
clutter_actor_set_accessible_name (priv->top_window_group, "Top window group"); clutter_actor_set_accessible_name (priv->top_window_group, "Top window group");
priv->feedback_group = meta_window_group_new (display); priv->feedback_group = meta_window_group_new (display);
clutter_actor_set_accessible_name (priv->feedback_group, "Feedback group"); clutter_actor_set_accessible_name (priv->feedback_group, "Feedback group");
clutter_actor_add_child (stage, priv->window_group); clutter_actor_add_child (stage, priv->window_group);
clutter_actor_add_child (stage, priv->top_window_group); clutter_actor_add_child (stage, priv->top_window_group);
@ -382,21 +382,21 @@ meta_compositor_add_window (MetaCompositor *compositor,
MetaWindowActor *window_actor; MetaWindowActor *window_actor;
ClutterActor *window_group; ClutterActor *window_group;
GType window_actor_type = G_TYPE_INVALID; GType window_actor_type = G_TYPE_INVALID;
const char *accessible_name = NULL; const char *accessible_name = NULL;
switch (window->client_type) switch (window->client_type)
{ {
#ifdef HAVE_X11_CLIENT #ifdef HAVE_X11_CLIENT
case META_WINDOW_CLIENT_TYPE_X11: case META_WINDOW_CLIENT_TYPE_X11:
window_actor_type = META_TYPE_WINDOW_ACTOR_X11; window_actor_type = META_TYPE_WINDOW_ACTOR_X11;
accessible_name = "X11 window"; accessible_name = "X11 window";
break; break;
#endif #endif
#ifdef HAVE_WAYLAND #ifdef HAVE_WAYLAND
case META_WINDOW_CLIENT_TYPE_WAYLAND: case META_WINDOW_CLIENT_TYPE_WAYLAND:
window_actor_type = META_TYPE_WINDOW_ACTOR_WAYLAND; window_actor_type = META_TYPE_WINDOW_ACTOR_WAYLAND;
accessible_name = "Wayland window"; accessible_name = "Wayland window";
break; break;
#endif #endif
@ -406,7 +406,7 @@ meta_compositor_add_window (MetaCompositor *compositor,
window_actor = g_object_new (window_actor_type, window_actor = g_object_new (window_actor_type,
"meta-window", window, "meta-window", window,
"accessible-name", accessible_name, "accessible-name", accessible_name,
"show-on-set-parent", FALSE, "show-on-set-parent", FALSE,
NULL); NULL);
@ -1338,7 +1338,7 @@ meta_compositor_flash_display (MetaCompositor *compositor,
clutter_actor_get_size (stage, &width, &height); clutter_actor_get_size (stage, &width, &height);
flash = clutter_actor_new (); flash = clutter_actor_new ();
clutter_actor_set_accessible_name (flash, "Flash actor"); clutter_actor_set_accessible_name (flash, "Flash actor");
clutter_actor_set_background_color (flash, &COGL_COLOR_INIT (0, 0, 0, 255)); clutter_actor_set_background_color (flash, &COGL_COLOR_INIT (0, 0, 0, 255));
clutter_actor_set_size (flash, width, height); clutter_actor_set_size (flash, width, height);
clutter_actor_set_opacity (flash, 0); clutter_actor_set_opacity (flash, 0);
@ -1378,7 +1378,7 @@ meta_compositor_flash_window (MetaCompositor *compositor,
ClutterTransition *transition; ClutterTransition *transition;
flash = clutter_actor_new (); flash = clutter_actor_new ();
clutter_actor_set_accessible_name (flash, "Flash actor"); clutter_actor_set_accessible_name (flash, "Flash actor");
clutter_actor_set_background_color (flash, &COGL_COLOR_INIT (0, 0, 0, 255)); clutter_actor_set_background_color (flash, &COGL_COLOR_INIT (0, 0, 0, 255));
clutter_actor_set_size (flash, window->rect.width, window->rect.height); clutter_actor_set_size (flash, window->rect.width, window->rect.height);
clutter_actor_set_position (flash, clutter_actor_set_position (flash,