Skip to content

Use TextTag scaling for zoom instead of CSS #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsparber merged 1 commit into from
Mar 28, 2026
Merged

Use TextTag scaling for zoom instead of CSS #226

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 19 additions & 11 deletions reflection-app/src/document_view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use std::cell::{Cell, RefCell};
use reflection_doc::document::{Document, DocumentId};

use adw::{prelude::*, subclass::prelude::*};
use gtk::{gdk, gio::prelude::ApplicationExtManual, glib, glib::clone};
use gtk::{gdk, glib, glib::clone};

use crate::{
ConnectionPopover, ReflectionApplication, ReflectionTextBuffer, TextView,
Expand All @@ -48,7 +48,7 @@ mod imp {
pub share_code_label: TemplateChild<gtk::Label>,
#[template_child]
pub copy_code_button: TemplateChild<gtk::Button>,
pub css_provider: gtk::CssProvider,
pub zoom_tag: gtk::TextTag,
pub font_size: Cell<f64>,
#[property(get, set = Self::set_font_scale, default = 0.0)]
pub font_scale: Cell<f64>,
Expand Down Expand Up @@ -134,19 +134,22 @@ mod imp {
let buffer = ReflectionTextBuffer::new();
self.text_view.set_buffer(Some(&buffer));

buffer.tag_table().add(&self.zoom_tag);
buffer.connect_changed(clone!(
#[weak(rename_to = this)]
self,
move |buffer| {
this.apply_zoom_tag(buffer.upcast_ref());
}
));

let size = ReflectionApplication::default()
.system_settings()
.monospace_font_name()
.map_or(BASE_TEXT_FONT_SIZE, |font| {
font.size() as f64 / gtk::pango::SCALE as f64
});
self.font_size.set(size);
self.obj().set_font_scale(0.0);
gtk::style_context_add_provider_for_display(
&gtk::Widget::display(self.obj().upcast_ref()),
&self.css_provider,
gtk::STYLE_PROVIDER_PRIORITY_APPLICATION,
);

let scroll_controller =
gtk::EventControllerScroll::new(gtk::EventControllerScrollFlags::VERTICAL);
Expand Down Expand Up @@ -218,13 +221,18 @@ mod imp {
self.font_scale.set(value);

let size = (font_size + self.obj().font_scale()).max(1.0);
self.zoom_level.set(size / font_size);
let scale = size / font_size;
self.zoom_level.set(scale);
self.obj().notify_zoom_level();
self.css_provider
.load_from_string(&format!(".sourceview {{ font-size: {size}pt; }}"));
self.zoom_tag.set_scale(scale);
self.apply_zoom_tag(&self.text_view.buffer());
self.obj().action_set_enabled("window.zoom-out", size > 1.0);
}

fn apply_zoom_tag(&self, buffer: &gtk::TextBuffer) {
buffer.apply_tag(&self.zoom_tag, &buffer.start_iter(), &buffer.end_iter());
}

fn set_document(&self, document: Option<Document>) {
if let Some(ref document) = document {
let document_id = Self::format_document_id(&document.id());
Expand Down