ebu/ebu-plugs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix attempt for screen scaling

Browse Source
This commit is contained in:
Ebu
2025-12-02 13:37:29 +01:00
parent 80c522095c
commit e093875c4f
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/gui.rs
View File

@@ -25,7 +25,7 @@ pub struct PluginGui {
_gui_context: Arc<dyn GuiContext>, _gui_context: Arc<dyn GuiContext>,
scaling_factor: f32, scaling_factor: f32,
freshener_bounds: Rect<f32>, freshener_screen_bounds: Rect<f32>,
freshener_image: Result<ImageId, String>, freshener_image: Result<ImageId, String>,
not_so_fresh_image: Result<ImageId, String>, not_so_fresh_image: Result<ImageId, String>,
@@ -72,7 +72,7 @@ impl PluginGui {
freshener_image: Err("Not loaded".to_owned()), freshener_image: Err("Not loaded".to_owned()),
fresh_dumbledore_image: Err("Not loaded".to_owned()), fresh_dumbledore_image: Err("Not loaded".to_owned()),
not_so_fresh_image: Err("Not loaded".to_owned()), not_so_fresh_image: Err("Not loaded".to_owned()),
freshener_bounds: Rect::default() freshener_screen_bounds: Rect::default()
}; };
if let Some(context) = window.gl_context() { if let Some(context) = window.gl_context() {
@@ -118,8 +118,6 @@ impl PluginGui {
impl WindowHandler for PluginGui { impl WindowHandler for PluginGui {
fn on_frame(&mut self, window: &mut baseview::Window) { fn on_frame(&mut self, window: &mut baseview::Window) {
const WINDOW_WIDTH: f32 = EditorWindow::WINDOW_SIZE.0 as f32;
const WINDOW_HEIGHT: f32 = EditorWindow::WINDOW_SIZE.1 as f32;
if self.canvas.is_none() { if self.canvas.is_none() {
return; return;
} }
@@ -130,7 +128,7 @@ impl WindowHandler for PluginGui {
} }
let font_size = 12.0 * self.scaling_factor; let font_size = 12.0 * self.scaling_factor;
self.freshener_bounds = Rect { self.freshener_screen_bounds = Rect {
x: 120.0 * self.scaling_factor, x: 120.0 * self.scaling_factor,
y: 20.0 * self.scaling_factor, y: 20.0 * self.scaling_factor,
width: FRESHENER_FRAME_WIDTH * self.scaling_factor, width: FRESHENER_FRAME_WIDTH * self.scaling_factor,
@@ -147,29 +145,34 @@ impl WindowHandler for PluginGui {
unsafe { unsafe {
context.make_current(); context.make_current();
} }
let (width, height) = (canvas.width(), canvas.height()); let (width, height) = (canvas.width() as f32, canvas.height() as f32);
canvas.reset(); canvas.reset();
canvas.clear_rect(0, 0, width, height, Color::rgbaf(0.5, 0.5, 0.6, 1.0)); canvas.clear_rect(0, 0, width as u32, height as u32, Color::rgbaf(0.5, 0.5, 0.6, 1.0));
let mut full_window_path = Path::new(); let mut full_window_path = Path::new();
full_window_path.rect(0.0, 0.0, width as f32, height as f32); full_window_path.rect(0.0, 0.0, width, height);
let mut freshener_path = Path::new(); let mut freshener_path = Path::new();
freshener_path.rect( freshener_path.rect(
self.freshener_bounds.x, self.freshener_screen_bounds.x,
self.freshener_bounds.y, self.freshener_screen_bounds.y,
self.freshener_bounds.width, self.freshener_screen_bounds.width,
self.freshener_bounds.height, self.freshener_screen_bounds.height,
); );
let bbox = canvas.path_bbox(&freshener_path);
let frame_index = (self.params.freshness.unmodulated_normalized_value() let frame_index = (self.params.freshness.unmodulated_normalized_value()
* (FRESHENER_FRAMES - 1) as f32) * (FRESHENER_FRAMES - 1) as f32)
.floor(); .floor();
let frame_x = (frame_index % FRESHENER_FRAMES_X as f32).floor(); let frame_x = (frame_index % FRESHENER_FRAMES_X as f32).floor();
let frame_y = (frame_index / FRESHENER_FRAMES_X as f32).floor(); let frame_y = (frame_index / FRESHENER_FRAMES_X as f32).floor();
let freshener_image_source_rect = Rect {
x: self.freshener_screen_bounds.x - frame_x * FRESHENER_FRAME_WIDTH,
y: self.freshener_screen_bounds.y - frame_y * FRESHENER_FRAME_HEIGHT,
width: FRESHENER_FRAME_WIDTH * FRESHENER_FRAMES_X as f32,
height: FRESHENER_FRAME_HEIGHT * FRESHENER_FRAMES_Y as f32,
};
if let Ok(not_so_fresh) = self.not_so_fresh_image { if let Ok(not_so_fresh) = self.not_so_fresh_image {
canvas.fill_path( canvas.fill_path(
&full_window_path, &full_window_path,
@@ -177,8 +180,8 @@ impl WindowHandler for PluginGui {
not_so_fresh, not_so_fresh,
0.0, 0.0,
0.0, 0.0,
WINDOW_WIDTH, width,
WINDOW_HEIGHT, height,
0.0, 0.0,
1.0, 1.0,
), ),
@@ -191,8 +194,8 @@ impl WindowHandler for PluginGui {
fresh_dumbledore, fresh_dumbledore,
0.0, 0.0,
0.0, 0.0,
WINDOW_WIDTH, width,
WINDOW_HEIGHT, height,
0.0, 0.0,
self.params.freshness.unmodulated_normalized_value(), self.params.freshness.unmodulated_normalized_value(),
), ),
@@ -204,10 +207,10 @@ impl WindowHandler for PluginGui {
&freshener_path, &freshener_path,
&Paint::image( &Paint::image(
freshener, freshener,
bbox.minx - frame_x * FRESHENER_FRAME_WIDTH, freshener_image_source_rect.x,
bbox.miny - frame_y * FRESHENER_FRAME_HEIGHT, freshener_image_source_rect.y,
self.freshener_bounds.width * FRESHENER_FRAMES_X as f32, freshener_image_source_rect.width,
self.freshener_bounds.height * FRESHENER_FRAMES_Y as f32, freshener_image_source_rect.height,
0.0, 0.0,
1.0, 1.0,
), ),
@@ -281,7 +284,7 @@ impl WindowHandler for PluginGui {
self.dirty = true; self.dirty = true;
} }
Event::Mouse(MouseEvent::ButtonPressed { button, .. }) => { Event::Mouse(MouseEvent::ButtonPressed { button, .. }) => {
self.dragging = self.freshener_bounds.contains(self.mouse_position) self.dragging = self.freshener_screen_bounds.contains(self.mouse_position)
&& button == MouseButton::Left; && button == MouseButton::Left;
if self.dragging { if self.dragging {
setter.begin_set_parameter(&self.params.freshness); setter.begin_set_parameter(&self.params.freshness);