Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions crates/rnote-ui/data/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ rnote_ui_gresources_icons_files = files(
'icons/scalable/actions/zoom-fit-width-symbolic.svg',
'icons/scalable/actions/zoom-in-symbolic.svg',
'icons/scalable/actions/zoom-out-symbolic.svg',
'icons/scalable/actions/zoom-real-width-symbolic.svg',
'icons/scalable/apps/rnote-devel.svg',
'icons/scalable/apps/rnote.svg',
'icons/scalable/mimetypes/application-rnote.svg',
Expand Down
1 change: 1 addition & 0 deletions crates/rnote-ui/data/resources.gresource.xml
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@
<file compressed="true">icons/scalable/actions/workspacelistentryicon-weather-symbolic.svg</file>
<file compressed="true">icons/scalable/actions/workspacelistentryicon-weight-symbolic.svg</file>
<file compressed="true">icons/scalable/actions/zoom-fit-width-symbolic.svg</file>
<file compressed="true">icons/scalable/actions/zoom-real-width-symbolic.svg</file>
<file compressed="true">icons/scalable/actions/zoom-in-symbolic.svg</file>
<file compressed="true">icons/scalable/actions/zoom-out-symbolic.svg</file>
<file compressed="true">icons/scalable/apps/rnote-devel.svg</file>
Expand Down
8 changes: 8 additions & 0 deletions crates/rnote-ui/data/ui/canvasmenu.ui
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,14 @@
<property name="action-name">win.zoom-fit-width</property>
</object>
</child>
<child>
<object class="GtkButton" id="zoom_real_width_button">
<property name="hexpand">false</property>
<property name="icon_name">zoom-real-width-symbolic</property>
<property name="tooltip_text" translatable="yes">Zoom to Real Size</property>
<property name="action-name">win.zoom-real-width</property>
</object>
</child>
</object>
</child>
<child>
Expand Down
31 changes: 31 additions & 0 deletions crates/rnote-ui/src/appwindow/actions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use gtk4::{
use p2d::bounding_volume::BoundingVolume;
use rnote_compose::SplitOrder;
use rnote_compose::penevent::ShortcutKey;
use rnote_engine::document::format::MeasureUnit;
use rnote_engine::engine::StrokeContent;
use rnote_engine::ext::GraphenePointExt;
use rnote_engine::pens::PenStyle;
Expand Down Expand Up @@ -68,6 +69,8 @@ impl RnAppWindow {
self.add_action(&action_zoom_reset);
let action_zoom_fit_width = gio::SimpleAction::new("zoom-fit-width", None);
self.add_action(&action_zoom_fit_width);
let action_zoom_real_width = gio::SimpleAction::new("zoom-real-width", None);
self.add_action(&action_zoom_real_width);
let action_zoomin = gio::SimpleAction::new("zoom-in", None);
self.add_action(&action_zoomin);
let action_zoomout = gio::SimpleAction::new("zoom-out", None);
Expand Down Expand Up @@ -643,6 +646,34 @@ impl RnAppWindow {
}
));

// Zoom real to width
action_zoom_real_width.connect_activate(clone!(
#[weak(rename_to=appwindow)]
self,
move |_, _| {
let Some(wrapper) = appwindow.active_tab_wrapper() else {
return;
};
let canvas = wrapper.canvas();
let viewport_center = canvas.engine_ref().camera.viewport_center();
let Some(surface) = appwindow.surface() else {
return;
};
let Some(monitor) = canvas.display().monitor_at_surface(&surface) else {
return;
};
let ppi = monitor.geometry().width() as f64 / monitor.width_mm() as f64
* MeasureUnit::AMOUNT_MM_IN_INCH;
let new_zoom = ppi / wrapper.canvas().engine_ref().document.config.format.dpi();
let mut widget_flags = canvas.engine_mut().zoom_w_timeout(new_zoom);
widget_flags |= canvas
.engine_mut()
.camera
.set_viewport_center(viewport_center);
appwindow.handle_widget_flags(widget_flags, &canvas)
}
));

// Zoom in
action_zoomin.connect_activate(clone!(
#[weak(rename_to=appwindow)]
Expand Down
2 changes: 2 additions & 0 deletions crates/rnote-ui/src/canvasmenu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ mod imp {
#[template_child]
pub(crate) zoom_fit_width_button: TemplateChild<Button>,
#[template_child]
pub(crate) zoom_real_width_button: TemplateChild<Button>,
#[template_child]
pub(crate) fixedsize_quickactions_box: TemplateChild<gtk4::Box>,
}

Expand Down
Loading