diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2022-02-10 00:08:12 +0100 |
|---|---|---|
| committer | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2022-02-12 16:03:37 +0000 |
| commit | 6c6499e23e9d2bb522e980acbd21ad70ea513d2d (patch) | |
| tree | 8e86a24b4b4f1e1e4de8cd33d754ae0f6a11d56a | |
| parent | 6756710996476345669fc3bc1d95db75be939eb8 (diff) | |
| download | gnome-control-center-6c6499e23e9d2bb522e980acbd21ad70ea513d2d.tar.gz | |
wacom: Pass GdkMonitor directly to calibrator object
Instead of figuring out a monitor number from a GdkMonitor, and
look the GdkMonitor back up, pass the GdkMonitor directly.
| -rw-r--r-- | panels/wacom/calibrator/calibrator-gui.c | 11 | ||||
| -rw-r--r-- | panels/wacom/calibrator/calibrator-gui.h | 2 | ||||
| -rw-r--r-- | panels/wacom/calibrator/main.c | 2 | ||||
| -rw-r--r-- | panels/wacom/cc-wacom-page.c | 15 |
4 files changed, 8 insertions, 22 deletions
diff --git a/panels/wacom/calibrator/calibrator-gui.c b/panels/wacom/calibrator/calibrator-gui.c index fd96882fc..cde307555 100644 --- a/panels/wacom/calibrator/calibrator-gui.c +++ b/panels/wacom/calibrator/calibrator-gui.c @@ -340,7 +340,7 @@ cc_calib_area_init (CcCalibArea *calib_area) */ CcCalibArea * cc_calib_area_new (GdkDisplay *display, - int n_monitor, + GdkMonitor *monitor, GdkDevice *device, FinishCallback callback, gpointer user_data, @@ -348,7 +348,6 @@ cc_calib_area_new (GdkDisplay *display, int threshold_misclick) { CcCalibArea *calib_area; - g_autoptr(GdkMonitor) monitor = NULL; g_return_val_if_fail (callback, NULL); @@ -360,11 +359,11 @@ cc_calib_area_new (GdkDisplay *display, calib_area->calibrator.threshold_misclick = threshold_misclick; /* Move to correct screen */ - if (display == NULL) - display = gdk_display_get_default (); - monitor = g_list_model_get_item (gdk_display_get_monitors (display), n_monitor); + if (monitor) + gtk_window_fullscreen_on_monitor (GTK_WINDOW (calib_area), monitor); + else + gtk_window_fullscreen (GTK_WINDOW (calib_area)); - gtk_window_fullscreen_on_monitor (GTK_WINDOW (calib_area), monitor); gtk_widget_show (GTK_WIDGET (calib_area)); return calib_area; diff --git a/panels/wacom/calibrator/calibrator-gui.h b/panels/wacom/calibrator/calibrator-gui.h index 4c102785d..5d6d1ae9a 100644 --- a/panels/wacom/calibrator/calibrator-gui.h +++ b/panels/wacom/calibrator/calibrator-gui.h @@ -42,7 +42,7 @@ G_DECLARE_FINAL_TYPE (CcCalibArea, cc_calib_area, CC, CALIB_AREA, GtkWindow) typedef void (*FinishCallback) (CcCalibArea *area, gpointer user_data); CcCalibArea * cc_calib_area_new (GdkDisplay *display, - int monitor, + GdkMonitor *monitor, GdkDevice *device, FinishCallback callback, gpointer user_data, diff --git a/panels/wacom/calibrator/main.c b/panels/wacom/calibrator/main.c index cf423f245..71421c7ed 100644 --- a/panels/wacom/calibrator/main.c +++ b/panels/wacom/calibrator/main.c @@ -403,7 +403,7 @@ int main(int argc, char** argv) g_setenv ("G_MESSAGES_DEBUG", "all", TRUE); calib_area = cc_calib_area_new (NULL, - 0, /* monitor */ + NULL, /* monitor */ NULL, /* NULL to accept input from any device */ calibration_finished_cb, NULL, diff --git a/panels/wacom/cc-wacom-page.c b/panels/wacom/cc-wacom-page.c index 1aaf7b565..0753e6e8f 100644 --- a/panels/wacom/cc-wacom-page.c +++ b/panels/wacom/cc-wacom-page.c @@ -217,23 +217,10 @@ run_calibration (CcWacomPage *page, gdouble *cal, GdkMonitor *monitor) { - GdkDisplay *display = gdk_monitor_get_display (monitor); - GListModel *monitors; - guint i, n_monitor = 0; - g_assert (page->area == NULL); - monitors = gdk_display_get_monitors (display); - for (i = 0; i < g_list_model_get_n_items (monitors); i++) { - g_autoptr(GdkMonitor) m = g_list_model_get_item (monitors, i); - if (monitor == m) { - n_monitor = i; - break; - } - } - page->area = cc_calib_area_new (NULL, - n_monitor, + monitor, cc_wacom_page_get_gdk_device (page), finish_calibration, page, |