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

backends: Fold device mapping check into backend

Browse Source 
Make the upper part agnostic about the device being relative in order
to avoid applying keep-aspect. The X11 bits already are, so make it
sure it's also the case for the native backend.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1486
This commit is contained in:
Carlos Garnacho 2020-05-06 20:20:49 +02:00 committed by Jonas Ådahl
parent b6a020e9ff
commit c4d11f7550
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backends/meta-input-settings.c
View File

@ -1054,17 +1054,9 @@ update_tablet_keep_aspect (MetaInputSettings *input_settings,
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings); input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
if (clutter_input_device_get_mapping_mode (device) ==
CLUTTER_INPUT_DEVICE_MAPPING_ABSOLUTE)
{
keep_aspect = g_settings_get_boolean (settings, "keep-aspect"); keep_aspect = g_settings_get_boolean (settings, "keep-aspect");
meta_input_settings_find_monitor (input_settings, settings, device, meta_input_settings_find_monitor (input_settings, settings, device,
NULL, &logical_monitor); NULL, &logical_monitor);
}
else
{
keep_aspect = FALSE;
}
input_settings_class->set_tablet_keep_aspect (input_settings, device, input_settings_class->set_tablet_keep_aspect (input_settings, device,
logical_monitor, keep_aspect); logical_monitor, keep_aspect);

4
src/backends/native/meta-input-settings-native.c
View File

@ -545,6 +545,10 @@ meta_input_settings_native_set_tablet_keep_aspect (MetaInputSettings *settings,
{ {
double aspect_ratio = 0; double aspect_ratio = 0;
if (clutter_input_device_get_mapping_mode (device) ==
CLUTTER_INPUT_DEVICE_MAPPING_RELATIVE)
keep_aspect = FALSE;
if (keep_aspect) if (keep_aspect)
{ {
int width, height; int width, height;