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

testing: Mention non-default scaling-settings during scaling-tests

Browse Source 
Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/679>
This commit is contained in:
MoonlightWave-12
2024-09-22 12:29:39 +02:00
parent 5288e10cab
commit a76c3c714e
1 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/state.rs
View File

@ -752,12 +752,23 @@ pub mod test {
} }
// scaling-tests // scaling-tests
// TODO: Combine `scaling_test_base` and `scaling_test_wide` into a single function.
fn scaling_test_base(pixel_width: i32, pixel_height: i32, physical_width: i32, physical_height: i32, scale: i32, expected_pixel_height: u32) { fn scaling_test_base(pixel_width: i32, pixel_height: i32, physical_width: i32, physical_height: i32, scale: i32, expected_pixel_height: u32) {
use crate::outputs::{Mode, Geometry, c, Size}; use crate::outputs::{Mode, Geometry, c, Size};
// TODO: Test with different settings for the scaling; at least the default (1.0), and another value.
// Currently, this uses the value set on the system.
// One can use the environment-variable `GSETTINGS_BACKEND=memory` to use the default-settings.
let gsettings = Settings::new("sm.puri.Squeekboard"); let gsettings = Settings::new("sm.puri.Squeekboard");
let scale_setting_horizontal = gsettings.double("scale-in-horizontal-orientation"); let scale_setting_horizontal = gsettings.double("scale-in-horizontal-screen-orientation");
let scale_setting_vertical = gsettings.double("scale-in-vertical-orientation"); let scale_setting_vertical = gsettings.double("scale-in-vertical-screen-orientation");
let (log_message_about_scaling, value_of_scaling_setting_for_log) =
if scale_setting_vertical != 1.0 && pixel_width < pixel_height {
(" Current scaling-multiplier in vertical orientation: ", scale_setting_vertical.to_string())}
else if scale_setting_horizontal != 1.0 {
(" Current scaling-multiplier in horizontal orientation: ", scale_setting_horizontal.to_string())}
else {("", "".to_string())};
assert_eq!( assert_eq!(
Application::get_preferred_height_and_arrangement(&OutputState { Application::get_preferred_height_and_arrangement(&OutputState {
@ -787,16 +798,26 @@ pub mod test {
}, },
}, },
ArrangementKind::Base, ArrangementKind::Base,
)), )), "Height of the panel is different.{}{}", log_message_about_scaling, value_of_scaling_setting_for_log
); );
} }
fn scaling_test_wide(pixel_width: i32, pixel_height: i32, physical_width: i32, physical_height: i32, scale: i32, expected_pixel_height: u32) { fn scaling_test_wide(pixel_width: i32, pixel_height: i32, physical_width: i32, physical_height: i32, scale: i32, expected_pixel_height: u32) {
use crate::outputs::{Mode, Geometry, c, Size}; use crate::outputs::{Mode, Geometry, c, Size};
// TODO: Test with different settings for the scaling; at least the default (1.0), and another value.
// Currently, this uses the value set on the system.
// One can use the environment-variable `GSETTINGS_BACKEND=memory` to use the default-settings.
let gsettings = Settings::new("sm.puri.Squeekboard"); let gsettings = Settings::new("sm.puri.Squeekboard");
let scale_setting_horizontal = gsettings.double("scale-in-horizontal-orientation"); let scale_setting_horizontal = gsettings.double("scale-in-horizontal-screen-orientation");
let scale_setting_vertical = gsettings.double("scale-in-vertical-orientation"); let scale_setting_vertical = gsettings.double("scale-in-vertical-screen-orientation");
let (log_message_about_scaling, value_of_scaling_setting_for_log) =
if scale_setting_vertical != 1.0 && pixel_width < pixel_height {
(" Current scaling-multiplier in vertical orientation: ", scale_setting_vertical.to_string())}
else if scale_setting_horizontal != 1.0 {
(" Current scaling-multiplier in horizontal orientation: ", scale_setting_horizontal.to_string())}
else {("", "".to_string())};
assert_eq!( assert_eq!(
Application::get_preferred_height_and_arrangement(&OutputState { Application::get_preferred_height_and_arrangement(&OutputState {
@ -826,7 +847,7 @@ pub mod test {
}, },
}, },
ArrangementKind::Wide, ArrangementKind::Wide,
)), )), "Height of the panel is different.{}{}", log_message_about_scaling, value_of_scaling_setting_for_log
); );
} }