s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scaling: Add a setting for fitting layouts to the panel

Browse Source 
It can be useful to deactivate this while designing layouts,
to be able to see the accurate size of those layouts.

Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/702>
This commit is contained in:
MoonlightWave-12
2024-11-03 13:27:34 +01:00
parent 291afe361c
commit b9f54a4e4b
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
data/sm.puri.Squeekboard.gschema.xml
View File

@ -27,6 +27,15 @@
For square screens, the setting for screens in landscape-orientation is used. For square screens, the setting for screens in landscape-orientation is used.
</description> </description>
</key> </key>
<key name='layout-shape-changes-to-fit-panel' type='b'>
<default>true</default>
<summary>Wether layouts will stretch to fit the panel or not</summary>
<description>
While this setting is active, the proportions of layouts can change,
to fit the available space on the panel.
It can be useful to deactivate this while designing layouts.
</description>
</key>
</schema> </schema>
</schemalist> </schemalist>

11
src/layout.rs
View File

@ -17,6 +17,8 @@
* and let the renderer scale and center it within the widget. * and let the renderer scale and center it within the widget.
*/ */
use gdk::prelude::SettingsExt;
use gio::Settings;
use std::cmp; use std::cmp;
use std::collections::HashMap; use std::collections::HashMap;
use std::ffi::CString; use std::ffi::CString;
@ -809,11 +811,18 @@ impl LayoutData {
&self, &self,
available: Size, available: Size,
) -> c::Transformation { ) -> c::Transformation {
let gsettings = Settings::new("sm.puri.Squeekboard");
let stretch_layout_to_fit_panel = gsettings.boolean ("layout-shape-changes-to-fit-panel");
let layout_stretching_limit: f64;
if stretch_layout_to_fit_panel == true { layout_stretching_limit = 1.055 }
else { layout_stretching_limit = 1.0 };
let size = self.calculate_size(); let size = self.calculate_size();
let h_scale = available.width / size.width; let h_scale = available.width / size.width;
let v_scale = available.height / size.height; let v_scale = available.height / size.height;
// Allow up to 5% (and a bit more) horizontal stretching for filling up available space // Allow up to 5% (and a bit more) horizontal stretching for filling up available space
let scale_x = if (h_scale / v_scale) < 1.055 { h_scale } else { v_scale }; let scale_x = if (h_scale / v_scale) < layout_stretching_limit { h_scale } else { v_scale };
let scale_y = cmp::min(FloatOrd(h_scale), FloatOrd(v_scale)).0; let scale_y = cmp::min(FloatOrd(h_scale), FloatOrd(v_scale)).0;
let outside_margins = c::Transformation { let outside_margins = c::Transformation {
origin_x: (available.width - (scale_x * size.width)) / 2.0, origin_x: (available.width - (scale_x * size.width)) / 2.0,