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

display: Use logical monitor API when requesting pad OSD

Browse Source 
Don't use the array index based logical monitor API and switch to the
one directly referencing logical monitor instances.

https://bugzilla.gnome.org/show_bug.cgi?id=777732
This commit is contained in:
Jonas Ådahl 2016-12-01 12:55:21 +08:00
parent af616c96d4
commit 06770b0dd4
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/display.c
View File

@ -3089,7 +3089,6 @@ meta_display_request_pad_osd (MetaDisplay *display,
const gchar *layout_path = NULL; const gchar *layout_path = NULL;
ClutterActor *osd; ClutterActor *osd;
MetaLogicalMonitor *logical_monitor; MetaLogicalMonitor *logical_monitor;
gint monitor_idx;
GSettings *settings; GSettings *settings;
#ifdef HAVE_LIBWACOM #ifdef HAVE_LIBWACOM
WacomDevice *wacom_device; WacomDevice *wacom_device;
@ -3119,20 +3118,12 @@ meta_display_request_pad_osd (MetaDisplay *display,
if (!layout_path || !settings) if (!layout_path || !settings)
return; return;
if (logical_monitor) if (!logical_monitor)
{ logical_monitor = meta_screen_get_current_logical_monitor (display->screen);
monitor_idx =
meta_screen_get_monitor_index_for_rect (display->screen,
&logical_monitor->rect);
}
else
{
monitor_idx = meta_screen_get_current_monitor (display->screen);
}
g_signal_emit (display, display_signals[SHOW_PAD_OSD], 0, g_signal_emit (display, display_signals[SHOW_PAD_OSD], 0,
pad, settings, layout_path, pad, settings, layout_path,
edition_mode, monitor_idx, &osd); edition_mode, logical_monitor->number, &osd);
if (osd) if (osd)
{ {