applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wacom: Set the last-calibrated-resolution key after calibrating

Browse source 
So g-s-d will know if calibration is needed when the monitor resolution
changes.

This is related to https://bugzilla.gnome.org/show_bug.cgi?id=677095
This commit is contained in:
Joaquim Rocha 2013-04-19 16:37:59 +02:00
parent f9000c6f5e
commit 2b34736ea8
3 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
panels/wacom/calibrator/gui_gtk.c
View file

@ -582,3 +582,10 @@ calib_area_free (CalibArea *area)
gtk_widget_destroy (area->window); gtk_widget_destroy (area->window);
g_free (area); g_free (area);
} }
void
calib_area_get_display_size (CalibArea *area, gint *width, gint *height)
{
*width = area->display_width;
*height = area->display_height;
}

2
panels/wacom/calibrator/gui_gtk.h
View file

@ -53,4 +53,6 @@ gboolean calib_area_finish (CalibArea *area,
void calib_area_free (CalibArea *area); void calib_area_free (CalibArea *area);
void calib_area_get_display_size (CalibArea *area, gint *width, gint *height);
#endif /* _gui_gtk_h */ #endif /* _gui_gtk_h */

29
panels/wacom/cc-wacom-page.c
View file

@ -147,15 +147,19 @@ get_layout_type (GsdWacomDevice *device)
} }
static void static void
set_calibration (gint *cal, set_calibration (GsdWacomDevice *device,
gsize ncal, const gint display_width,
GSettings *settings) const gint display_height,
gint *cal,
gsize ncal,
GSettings *settings)
{ {
GVariant *current; /* current calibration */ GVariant *current; /* current calibration */
GVariant *array; /* new calibration */ GVariant *array; /* new calibration */
GVariant *last_resolution;
GVariant **tmp; GVariant **tmp;
gsize nvalues; gsize nvalues;
int i; gint i;
current = g_settings_get_value (settings, "area"); current = g_settings_get_value (settings, "area");
g_variant_get_fixed_array (current, &nvalues, sizeof (gint32)); g_variant_get_fixed_array (current, &nvalues, sizeof (gint32));
@ -172,6 +176,14 @@ set_calibration (gint *cal,
g_settings_set_value (settings, "area", array); g_settings_set_value (settings, "area", array);
g_free (tmp); g_free (tmp);
/* set the last-calibration-resolution */
last_resolution = g_variant_new ("(ii)", display_width, display_height);
settings = gsd_wacom_device_get_settings (device);
g_settings_set_value (settings,
"last-calibrated-resolution",
last_resolution);
g_clear_pointer (&last_resolution, g_variant_unref);
} }
static void static void
@ -182,7 +194,7 @@ finish_calibration (CalibArea *area,
CcWacomPagePrivate *priv = page->priv; CcWacomPagePrivate *priv = page->priv;
XYinfo axis; XYinfo axis;
gboolean swap_xy; gboolean swap_xy;
int cal[4]; gint cal[4], display_width, display_height;
if (calib_area_finish (area, &axis, &swap_xy)) { if (calib_area_finish (area, &axis, &swap_xy)) {
cal[0] = axis.x_min; cal[0] = axis.x_min;
@ -190,7 +202,12 @@ finish_calibration (CalibArea *area,
cal[2] = axis.x_max; cal[2] = axis.x_max;
cal[3] = axis.y_max; cal[3] = axis.y_max;
set_calibration(cal, 4, priv->wacom_settings); calib_area_get_display_size (area, &display_width, &display_height);
set_calibration (page->priv->stylus,
display_width,
display_height,
cal, 4, priv->wacom_settings);
} }
calib_area_free (area); calib_area_free (area);