diff options
| author | William Wold <[email protected]> | 2019-06-19 19:00:12 +0000 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-06-21 18:47:54 +0200 |
| commit | 3cd3758a35cb0027bee8bda80e89864eaa24c2a8 (patch) | |
| tree | a4c4568d365a12036b1a48e7dd17e033ab33c3af /mate-panel/panel-struts.c | |
| parent | 0a818dee94ddee0a510973e482def9945c0c267e (diff) | |
| download | mate-panel-3cd3758a35cb0027bee8bda80e89864eaa24c2a8.tar.bz2 mate-panel-3cd3758a35cb0027bee8bda80e89864eaa24c2a8.tar.xz | |
Update to the new panel_multimonitor functions
Diffstat (limited to 'mate-panel/panel-struts.c')
| -rw-r--r-- | mate-panel/panel-struts.c | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/mate-panel/panel-struts.c b/mate-panel/panel-struts.c index c87eda3a..8e7fc874 100644 --- a/mate-panel/panel-struts.c +++ b/mate-panel/panel-struts.c @@ -68,17 +68,16 @@ panel_struts_find_strut (PanelToplevel *toplevel) } static void -panel_struts_get_monitor_geometry (GdkScreen *screen, - int monitor, +panel_struts_get_monitor_geometry (int monitor, int *x, int *y, int *width, int *height) { - *x = panel_multiscreen_x (screen, monitor); - *y = panel_multiscreen_y (screen, monitor); - *width = panel_multiscreen_width (screen, monitor); - *height = panel_multiscreen_height (screen, monitor); + *x = panel_multimonitor_x (monitor); + *y = panel_multimonitor_y (monitor); + *width = panel_multimonitor_width (monitor); + *height = panel_multimonitor_height (monitor); } static PanelStrut * @@ -201,7 +200,7 @@ panel_struts_allocate_struts (PanelToplevel *toplevel, if (strut->screen != screen || strut->monitor != monitor) continue; - panel_struts_get_monitor_geometry (strut->screen, strut->monitor, + panel_struts_get_monitor_geometry (strut->monitor, &monitor_x, &monitor_y, &monitor_width, &monitor_height); @@ -274,19 +273,17 @@ panel_struts_set_window_hint (PanelToplevel *toplevel) screen_width = WidthOfScreen (gdk_x11_screen_get_xscreen (strut->screen)) / scale; screen_height = HeightOfScreen (gdk_x11_screen_get_xscreen (strut->screen)) / scale; - panel_struts_get_monitor_geometry (strut->screen, - strut->monitor, + panel_struts_get_monitor_geometry (strut->monitor, &monitor_x, &monitor_y, &monitor_width, &monitor_height); - panel_multiscreen_is_at_visible_extreme (strut->screen, - strut->monitor, - &leftmost, - &rightmost, - &topmost, - &bottommost); + panel_multimonitor_is_at_visible_extreme (strut->monitor, + &leftmost, + &rightmost, + &topmost, + &bottommost); switch (strut->orientation) { case PANEL_ORIENTATION_TOP: @@ -434,7 +431,7 @@ panel_struts_register_strut (PanelToplevel *toplevel, strut->strut_start = strut_start; strut->strut_end = strut_end; - panel_struts_get_monitor_geometry (screen, monitor, + panel_struts_get_monitor_geometry (monitor, &monitor_x, &monitor_y, &monitor_width, &monitor_height); |