summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Gerecke <killertofu@gmail.com>2017-06-20 15:55:26 -0700
committerCarlos Garnacho <carlosg@gnome.org>2017-07-05 23:50:50 +0200
commit83bdd852aecb8d353a58a5ec701a6bc1324b4638 (patch)
tree97bca97163bcf23f4b99cace1f47e8b95e90b3d5
parentbe835b321a2657721eedfe0c6b34c3e462a93476 (diff)
downloadgnome-control-center-83bdd852aecb8d353a58a5ec701a6bc1324b4638.tar.gz
wacom: Correct order of area calibration values
Commit cf408c27b0 changed how the values stored in the "area" key were calculated in order be compatible with its updated schema. Unfortunately, it overlooked the fact that updated schema also changed the order of the values from "left, top, right, bottom" to "left, right, top, bottom". Because of this, corrections intended to be applied to the top and right screen edges were swapped. This can cause a noticible cursor offset to occur after finishing calibration. https://bugzilla.gnome.org/show_bug.cgi?id=784009
-rw-r--r--panels/wacom/cc-wacom-page.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/panels/wacom/cc-wacom-page.c b/panels/wacom/cc-wacom-page.c
index 13b072920..b16d74ff8 100644
--- a/panels/wacom/cc-wacom-page.c
+++ b/panels/wacom/cc-wacom-page.c
@@ -169,7 +169,7 @@ set_calibration (CcWacomDevice *device,
g_free (tmp);
- g_debug ("Setting area top (%f, %f) bottom (%f, %f) (last used resolution: %d x %d)",
+ g_debug ("Setting area to %f, %f, %f, %f (left/right/top/bottom) (last used resolution: %d x %d)",
cal[0], cal[1], cal[2], cal[3],
display_width, display_height);
}
@@ -187,8 +187,8 @@ finish_calibration (CalibArea *area,
if (calib_area_finish (area)) {
calib_area_get_padding (area, &axis);
cal[0] = axis.x_min;
- cal[1] = axis.y_min;
- cal[2] = axis.x_max;
+ cal[1] = axis.x_max;
+ cal[2] = axis.y_min;
cal[3] = axis.y_max;
calib_area_get_display_size (area, &display_width, &display_height);