tree: update to latest version of wp_fractional_scale
This commit is contained in:
parent
e61d6ab074
commit
5b2eb5855a
22 changed files with 104 additions and 54 deletions
|
|
@ -9,6 +9,7 @@ use {
|
|||
},
|
||||
rect::Rect,
|
||||
render::{Renderer, Texture},
|
||||
scale::Scale,
|
||||
state::State,
|
||||
text,
|
||||
tree::{
|
||||
|
|
@ -85,7 +86,7 @@ pub struct ContainerRenderData {
|
|||
pub last_active_rect: Option<Rect>,
|
||||
pub border_rects: Vec<Rect>,
|
||||
pub underline_rects: Vec<Rect>,
|
||||
pub titles: SmallMapMut<Fixed, Vec<ContainerTitle>, 2>,
|
||||
pub titles: SmallMapMut<Scale, Vec<ContainerTitle>, 2>,
|
||||
}
|
||||
|
||||
pub struct ContainerNode {
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ use {
|
|||
ifs::wl_seat::{NodeSeatState, SeatId, WlSeatGlobal, BTN_LEFT},
|
||||
rect::Rect,
|
||||
render::{Renderer, Texture},
|
||||
scale::Scale,
|
||||
state::State,
|
||||
text,
|
||||
tree::{
|
||||
|
|
@ -42,7 +43,7 @@ pub struct FloatNode {
|
|||
pub layout_scheduled: Cell<bool>,
|
||||
pub render_titles_scheduled: Cell<bool>,
|
||||
pub title: RefCell<String>,
|
||||
pub title_textures: CopyHashMap<Fixed, Rc<Texture>>,
|
||||
pub title_textures: CopyHashMap<Scale, Rc<Texture>>,
|
||||
seats: RefCell<AHashMap<SeatId, SeatState>>,
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ use {
|
|||
},
|
||||
rect::Rect,
|
||||
render::{Framebuffer, Renderer, Texture},
|
||||
scale::Scale,
|
||||
state::State,
|
||||
text,
|
||||
tree::{
|
||||
|
|
@ -57,7 +58,7 @@ pub struct OutputNode {
|
|||
pub scroll: Scroller,
|
||||
pub pointer_positions: CopyHashMap<SeatId, (i32, i32)>,
|
||||
pub lock_surface: CloneCell<Option<Rc<ExtSessionLockSurfaceV1>>>,
|
||||
pub preferred_scale: Cell<Fixed>,
|
||||
pub preferred_scale: Cell<Scale>,
|
||||
pub hardware_cursor: CloneCell<Option<Rc<dyn HardwareCursor>>>,
|
||||
pub update_render_data_scheduled: Cell<bool>,
|
||||
pub screencasts: CopyHashMap<(ClientId, JayScreencastId), Rc<JayScreencast>>,
|
||||
|
|
@ -102,7 +103,7 @@ impl OutputNode {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn set_preferred_scale(self: &Rc<Self>, scale: Fixed) {
|
||||
pub fn set_preferred_scale(self: &Rc<Self>, scale: Scale) {
|
||||
let old_scale = self.preferred_scale.replace(scale);
|
||||
if scale == old_scale {
|
||||
return;
|
||||
|
|
@ -115,7 +116,7 @@ impl OutputNode {
|
|||
self.state.add_output_scale(scale);
|
||||
let rect = self.calculate_extents();
|
||||
self.change_extents_(&rect);
|
||||
let mut visitor = SurfaceSendPreferredScaleVisitor(scale);
|
||||
let mut visitor = SurfaceSendPreferredScaleVisitor;
|
||||
self.node_visit_children(&mut visitor);
|
||||
for ws in self.workspaces.iter() {
|
||||
for stacked in ws.stacked.iter() {
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ use {
|
|||
ifs::wl_seat::{NodeSeatState, WlSeatGlobal},
|
||||
rect::Rect,
|
||||
render::{Renderer, Texture},
|
||||
scale::Scale,
|
||||
state::State,
|
||||
text,
|
||||
tree::{
|
||||
|
|
@ -23,7 +24,7 @@ pub struct PlaceholderNode {
|
|||
id: PlaceholderNodeId,
|
||||
toplevel: ToplevelData,
|
||||
destroyed: Cell<bool>,
|
||||
pub textures: SmallMap<Fixed, Rc<Texture>, 2>,
|
||||
pub textures: SmallMap<Scale, Rc<Texture>, 2>,
|
||||
}
|
||||
|
||||
impl PlaceholderNode {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue