jess
/
Graphite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Desktop: Fix new document offset on first startup (#3738) 

Desktop: Fix new document offset
This commit is contained in:
Timon 2026-02-11 19:08:01 +00:00 committed by Keavon Chambers
parent 4cda1ddd29
commit 4cdfbb22e8
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
editor/src/messages/viewport/viewport_message_handler.rs
View File

@ -13,8 +13,8 @@ impl Default for ViewportMessageHandler {
fn default() -> Self { fn default() -> Self {
Self { Self {
bounds: Bounds { bounds: Bounds {
offset: Point { x: 0.0, y: 0.0 }, offset: Point { x: 0., y: 0. },
size: Point { x: 0.0, y: 0.0 }, size: Point { x: 0., y: 0. },
}, },
scale: 1.0, scale: 1.0,
} }
@ -26,7 +26,7 @@ impl MessageHandler<ViewportMessage, ()> for ViewportMessageHandler {
fn process_message(&mut self, message: ViewportMessage, responses: &mut VecDeque<Message>, _: ()) { fn process_message(&mut self, message: ViewportMessage, responses: &mut VecDeque<Message>, _: ()) {
match message { match message {
ViewportMessage::Update { x, y, width, height, scale } => { ViewportMessage::Update { x, y, width, height, scale } => {
assert_ne!(scale, 0.0, "Viewport scale cannot be zero"); assert_ne!(scale, 0., "Viewport scale cannot be zero");
self.scale = scale; self.scale = scale;
self.bounds = Bounds { self.bounds = Bounds {
@ -51,14 +51,16 @@ impl MessageHandler<ViewportMessage, ()> for ViewportMessageHandler {
responses.add(NavigationMessage::CanvasPan { delta: DVec2::ZERO }); responses.add(NavigationMessage::CanvasPan { delta: DVec2::ZERO });
responses.add(DeferMessage::AfterGraphRun { if self.is_valid() {
messages: vec![ responses.add(DeferMessage::AfterGraphRun {
DeferMessage::AfterGraphRun { messages: vec![
messages: vec![DeferMessage::TriggerNavigationReady.into()], DeferMessage::AfterGraphRun {
} messages: vec![DeferMessage::TriggerNavigationReady.into()],
.into(), }
], .into(),
}); ],
});
}
} }
advertise_actions!(ViewportMessageDiscriminant;); advertise_actions!(ViewportMessageDiscriminant;);
@ -94,7 +96,7 @@ impl ViewportMessageHandler {
pub fn center_in_viewport_space(&self) -> LogicalPoint { pub fn center_in_viewport_space(&self) -> LogicalPoint {
let size = self.size(); let size = self.size();
LogicalPoint { LogicalPoint {
inner: Point { x: size.x() / 2.0, y: size.y() / 2.0 }, inner: Point { x: size.x() / 2., y: size.y() / 2. },
scale: size.scale, scale: size.scale,
} }
} }
@ -104,13 +106,17 @@ impl ViewportMessageHandler {
let offset = self.offset(); let offset = self.offset();
LogicalPoint { LogicalPoint {
inner: Point { inner: Point {
x: (size.x() / 2.0) + offset.x(), x: (size.x() / 2.) + offset.x(),
y: (size.y() / 2.0) + offset.y(), y: (size.y() / 2.) + offset.y(),
}, },
scale: size.scale, scale: size.scale,
} }
} }
pub fn is_valid(&self) -> bool {
self.scale > 0. && self.bounds.size.x() > 0. && self.bounds.size.y() > 0. && self.bounds.offset.x() >= 0. && self.bounds.offset.y() >= 0.
}
pub(crate) fn is_in_bounds(&self, point: LogicalPoint) -> bool { pub(crate) fn is_in_bounds(&self, point: LogicalPoint) -> bool {
point.x() >= self.bounds.x() && point.y() >= self.bounds.y() && point.x() <= self.bounds.x() + self.bounds.width() && point.y() <= self.bounds.y() + self.bounds.height() point.x() >= self.bounds.x() && point.y() >= self.bounds.y() && point.x() <= self.bounds.x() + self.bounds.width() && point.y() <= self.bounds.y() + self.bounds.height()
} }