isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 08:30:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland/surface-role: Make geometry scale API return int

Browse Source 
Geometry scale are always ints, callers always assumed they were ints,
but they were doubles. Make them ints.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2460>
This commit is contained in:
Jonas Ådahl 2022-06-12 14:06:10 +02:00 committed by Marge Bot
parent a49c4e188a
commit 71ea01f54c
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wayland/meta-wayland-actor-surface.c
View File

@ -157,7 +157,7 @@ meta_wayland_actor_surface_emit_frame_callbacks (MetaWaylandActorSurface *actor_
} }
} }
double int
meta_wayland_actor_surface_get_geometry_scale (MetaWaylandActorSurface *actor_surface) meta_wayland_actor_surface_get_geometry_scale (MetaWaylandActorSurface *actor_surface)
{ {
MetaWaylandActorSurfaceClass *actor_surface_class = MetaWaylandActorSurfaceClass *actor_surface_class =

4
src/wayland/meta-wayland-actor-surface.h
View File

@ -33,12 +33,12 @@ struct _MetaWaylandActorSurfaceClass
{ {
MetaWaylandSurfaceRoleClass parent_class; MetaWaylandSurfaceRoleClass parent_class;
double (* get_geometry_scale) (MetaWaylandActorSurface *actor_surface); int (* get_geometry_scale) (MetaWaylandActorSurface *actor_surface);
void (* sync_actor_state) (MetaWaylandActorSurface *actor_surface); void (* sync_actor_state) (MetaWaylandActorSurface *actor_surface);
}; };
void meta_wayland_actor_surface_sync_actor_state (MetaWaylandActorSurface *actor_surface); void meta_wayland_actor_surface_sync_actor_state (MetaWaylandActorSurface *actor_surface);
double meta_wayland_actor_surface_get_geometry_scale (MetaWaylandActorSurface *actor_surface); int meta_wayland_actor_surface_get_geometry_scale (MetaWaylandActorSurface *actor_surface);
META_EXPORT_TEST META_EXPORT_TEST
MetaSurfaceActor * meta_wayland_actor_surface_get_actor (MetaWaylandActorSurface *actor_surface); MetaSurfaceActor * meta_wayland_actor_surface_get_actor (MetaWaylandActorSurface *actor_surface);

4
src/wayland/meta-wayland-dnd-surface.c
View File

@ -84,7 +84,7 @@ dnd_surface_find_logical_monitor (MetaWaylandActorSurface *actor_surface)
point.x, point.y); point.x, point.y);
} }
static double static int
dnd_subsurface_get_geometry_scale (MetaWaylandActorSurface *actor_surface) dnd_subsurface_get_geometry_scale (MetaWaylandActorSurface *actor_surface)
{ {
if (meta_is_stage_views_scaled ()) if (meta_is_stage_views_scaled ())
@ -96,7 +96,7 @@ dnd_subsurface_get_geometry_scale (MetaWaylandActorSurface *actor_surface)
MetaLogicalMonitor *logical_monitor; MetaLogicalMonitor *logical_monitor;
logical_monitor = dnd_surface_find_logical_monitor (actor_surface); logical_monitor = dnd_surface_find_logical_monitor (actor_surface);
return meta_logical_monitor_get_scale (logical_monitor); return (int) roundf (meta_logical_monitor_get_scale (logical_monitor));
} }
} }

4
src/wayland/meta-wayland-shell-surface.c
View File

@ -234,7 +234,7 @@ meta_wayland_shell_surface_surface_apply_state (MetaWaylandSurfaceRole *surface
MetaWaylandSurfaceRoleClass *surface_role_class; MetaWaylandSurfaceRoleClass *surface_role_class;
MetaWindow *window; MetaWindow *window;
MetaWaylandBuffer *buffer; MetaWaylandBuffer *buffer;
double geometry_scale; int geometry_scale;
surface_role_class = surface_role_class =
META_WAYLAND_SURFACE_ROLE_CLASS (meta_wayland_shell_surface_parent_class); META_WAYLAND_SURFACE_ROLE_CLASS (meta_wayland_shell_surface_parent_class);
@ -285,7 +285,7 @@ meta_wayland_shell_surface_notify_subsurface_state_changed (MetaWaylandSurfaceRo
meta_window_actor_wayland_rebuild_surface_tree (window_actor); meta_window_actor_wayland_rebuild_surface_tree (window_actor);
} }
static double static int
meta_wayland_shell_surface_get_geometry_scale (MetaWaylandActorSurface *actor_surface) meta_wayland_shell_surface_get_geometry_scale (MetaWaylandActorSurface *actor_surface)
{ {
MetaWaylandSurfaceRole *surface_role = MetaWaylandSurfaceRole *surface_role =

2
src/wayland/meta-wayland-subsurface.c
View File

@ -227,7 +227,7 @@ meta_wayland_subsurface_notify_subsurface_state_changed (MetaWaylandSurfaceRole
return meta_wayland_surface_notify_subsurface_state_changed (parent); return meta_wayland_surface_notify_subsurface_state_changed (parent);
} }
static double static int
meta_wayland_subsurface_get_geometry_scale (MetaWaylandActorSurface *actor_surface) meta_wayland_subsurface_get_geometry_scale (MetaWaylandActorSurface *actor_surface)
{ {
MetaWaylandSurfaceRole *surface_role = MetaWaylandSurfaceRole *surface_role =

2
src/wayland/meta-xwayland-surface.c
View File

@ -184,7 +184,7 @@ meta_xwayland_surface_get_window (MetaWaylandSurfaceRole *surface_role)
return xwayland_surface->window; return xwayland_surface->window;
} }
static double static int
meta_xwayland_surface_get_geometry_scale (MetaWaylandActorSurface *actor_surface) meta_xwayland_surface_get_geometry_scale (MetaWaylandActorSurface *actor_surface)
{ {
return 1; return 1;