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

panel: Use scaling to set height

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2022-04-04 14:21:15 +00:00
parent 7c43528ebf
commit 29b30fbe22
4 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/state.rs
View File

@ -7,7 +7,7 @@
use crate::animation;
use crate::imservice::{ ContentHint, ContentPurpose };
use crate::main::{ Commands, PanelCommand };
use crate::main::{ Commands, PanelCommand, PixelSize };
use crate::outputs;
use crate::outputs::{OutputId, OutputState};
use std::cmp;
@ -238,7 +238,7 @@ impl Application {
}
}
fn get_preferred_height(output: &OutputState) -> Option<u32> {
fn get_preferred_height(output: &OutputState) -> Option<PixelSize> {
output.get_pixel_size()
.map(|px_size| {
let height = {
@ -253,7 +253,10 @@ impl Application {
}
}
};
cmp::min(height, px_size.height / 2)
PixelSize {
scale_factor: output.scale as u32,
pixels: cmp::min(height, px_size.height / 2),
}
})
}
@ -265,10 +268,10 @@ impl Application {
Some(output) => {
// Hoping that this will get optimized out on branches not using `visible`.
let height = Self::get_preferred_height(self.outputs.get(&output).unwrap())
.unwrap_or(0);
.unwrap_or(PixelSize{pixels: 0, scale_factor: 1});
// TODO: Instead of setting size to 0 when the output is invalid,
// simply go invisible.
let visible = animation::Outcome::Visible{output, height};
let visible = animation::Outcome::Visible{ output, height };
match (self.physical_keyboard, self.visibility_override) {
(_, visibility::State::ForcedHidden) => animation::Outcome::Hidden,