tmp

Author: timon-schelling

desktop/src/cef.rs

@@ -77,12 +77,22 @@ impl ViewInfo {
 	pub(crate) fn scale(&self) -> f64 {
 		self.scale
 	}
-	pub(crate) fn scaled_width(&self) -> usize {
+	pub(crate) fn zoom(&self) -> f64 {
+		self.scale.ln() / 1.2f64.ln()
+	}
+	pub(crate) fn logical_width(&self) -> usize {
 		(self.width as f64 / self.scale).round() as usize
 	}
-	pub(crate) fn scaled_height(&self) -> usize {
+	pub(crate) fn logical_height(&self) -> usize {
 		(self.height as f64 / self.scale).round() as usize
 	}
+
+	pub(crate) fn physical_width(&self) -> usize {
+		self.width
+	}
+	pub(crate) fn physical_height(&self) -> usize {
+		self.height
+	}
 }
 impl Default for ViewInfo {
 	fn default() -> Self {

desktop/src/cef/context/builder.rs

@@ -197,6 +197,7 @@ fn create_browser<H: CefEventHandler>(event_handler: H, instance_dir: PathBuf, d
 
 	if let Some(browser) = browser {
 		Ok(SingleThreadedCefContext {
+			event_handler,
 			browser,
 			input_state: InputState::default(),
 			instance_dir,

desktop/src/cef/context/multithreaded.rs

@@ -3,6 +3,7 @@ use cef::{Task, ThreadId, post_task};
 use std::cell::RefCell;
 use winit::event::WindowEvent;
 
+use crate::cef::CefEventHandler;
 use crate::cef::internal::task::ClosureTask;
 
 use super::CefContext;

desktop/src/cef/context/singlethreaded.rs

@@ -1,14 +1,15 @@
 use cef::{Browser, ImplBrowser};
 use winit::event::WindowEvent;
 
-use crate::cef::input;
 use crate::cef::input::InputState;
 use crate::cef::internal::NotifyViewInfoChanged;
 use crate::cef::ipc::{MessageType, SendMessage};
+use crate::cef::{CefEventHandler, input};
 
 use super::CefContext;
 
 pub(super) struct SingleThreadedCefContext {
+	pub(super) event_handler: Box<dyn CefEventHandler>,
 	pub(super) browser: Browser,
 	pub(super) input_state: InputState,
 	pub(super) instance_dir: std::path::PathBuf,
@@ -24,7 +25,8 @@ impl CefContext for SingleThreadedCefContext {
 	}
 
 	fn notify_view_info_changed(&self) {
-		self.browser.host().unwrap().notify_view_info_changed();
+		let view_info = self.event_handler.view_info();
+		self.browser.host().unwrap().notify_view_info_changed(&view_info);
 	}
 
 	fn send_web_message(&self, message: Vec<u8>) {

desktop/src/cef/internal.rs

@@ -2,6 +2,7 @@ mod browser_process_app;
 mod browser_process_client;
 mod browser_process_handler;
 mod browser_process_life_span_handler;
+mod browser_process_load_handler;
 
 mod render_process_app;
 mod render_process_handler;
@@ -23,12 +24,15 @@ pub(super) use render_handler::RenderHandlerImpl;
 pub(super) use render_process_app::RenderProcessAppImpl;
 pub(super) use scheme_handler_factory::SchemeHandlerFactoryImpl;
 
+use crate::cef::ViewInfo;
+
 pub(super) trait NotifyViewInfoChanged {
-	fn notify_view_info_changed(&self);
+	fn notify_view_info_changed(&self, view_info: &ViewInfo);
 }
 impl<T: cef::ImplBrowserHost> NotifyViewInfoChanged for T {
-	fn notify_view_info_changed(&self) {
+	fn notify_view_info_changed(&self, view_info: &ViewInfo) {
 		self.notify_screen_info_changed();
 		self.was_resized();
+		self.set_zoom_level(view_info.zoom());
 	}
 }

desktop/src/cef/internal/browser_process_load_handler.rs

@@ -0,0 +1,61 @@
+use std::time::{Duration, Instant};
+
+use cef::rc::{Rc, RcImpl};
+use cef::sys::{_cef_load_handler_t, cef_base_ref_counted_t, cef_load_handler_t};
+use cef::{CefString, ImplBrowser, ImplBrowserHost, ImplLoadHandler, WrapLoadHandler};
+
+use crate::cef::CefEventHandler;
+
+pub(crate) struct LoadHandlerImpl<H: CefEventHandler> {
+	object: *mut RcImpl<cef_load_handler_t, Self>,
+	event_handler: H,
+}
+impl<H: CefEventHandler> LoadHandlerImpl<H> {
+	pub(crate) fn new(event_handler: H) -> Self {
+		Self {
+			object: std::ptr::null_mut(),
+			event_handler,
+		}
+	}
+}
+
+impl<H: CefEventHandler + Clone> ImplLoadHandler for LoadHandlerImpl<H> {
+	fn on_loading_state_change(&self, browser: Option<&mut cef::Browser>, is_loading: ::std::os::raw::c_int, can_go_back: ::std::os::raw::c_int, can_go_forward: ::std::os::raw::c_int) {
+		if let Some(browser) = browser
+			&& is_loading == 0
+		{
+			let view_info = self.event_handler.view_info();
+			browser.host().unwrap().set_zoom_level(view_info.zoom());
+		}
+	}
+
+	fn get_raw(&self) -> *mut _cef_load_handler_t {
+		self.object.cast()
+	}
+}
+
+impl<H: CefEventHandler + Clone> Clone for LoadHandlerImpl<H> {
+	fn clone(&self) -> Self {
+		unsafe {
+			let rc_impl = &mut *self.object;
+			rc_impl.interface.add_ref();
+		}
+		Self {
+			object: self.object,
+			event_handler: self.event_handler.clone(),
+		}
+	}
+}
+impl<H: CefEventHandler> Rc for LoadHandlerImpl<H> {
+	fn as_base(&self) -> &cef_base_ref_counted_t {
+		unsafe {
+			let base = &*self.object;
+			std::mem::transmute(&base.cef_object)
+		}
+	}
+}
+impl<H: CefEventHandler + Clone> WrapLoadHandler for LoadHandlerImpl<H> {
+	fn wrap_rc(&mut self, object: *mut RcImpl<_cef_load_handler_t, Self>) {
+		self.object = object;
+	}
+}

desktop/src/cef/internal/render_handler.rs

@@ -1,6 +1,6 @@
 use cef::rc::{Rc, RcImpl};
 use cef::sys::{_cef_render_handler_t, cef_base_ref_counted_t};
-use cef::{Browser, ImplRenderHandler, PaintElementType, Rect, WrapRenderHandler};
+use cef::{Browser, ImplBrowser, ImplBrowserHost, ImplRenderHandler, PaintElementType, Rect, WrapRenderHandler};
 
 use crate::cef::CefEventHandler;
 use crate::render::FrameBufferRef;
@@ -25,32 +25,12 @@ impl<H: CefEventHandler> ImplRenderHandler for RenderHandlerImpl<H> {
 			*rect = Rect {
 				x: 0,
 				y: 0,
-				width: view_info.scaled_width() as i32,
-				height: view_info.scaled_height() as i32,
+				width: view_info.physical_width() as i32,
+				height: view_info.physical_height() as i32,
 			};
 		}
 	}
 
-	fn screen_info(&self, _browser: Option<&mut Browser>, screen_info: Option<&mut cef::ScreenInfo>) -> std::ffi::c_int {
-		if let Some(screen_info) = screen_info {
-			let view_info = self.event_handler.view_info();
-
-			screen_info.device_scale_factor = view_info.scale() as f32;
-
-			let rect = Rect {
-				x: 0,
-				y: 0,
-				width: view_info.scaled_width() as i32,
-				height: view_info.scaled_height() as i32,
-			};
-			screen_info.rect = rect.clone();
-			screen_info.available_rect = rect;
-
-			return 1;
-		}
-		0
-	}
-
 	fn on_paint(
 		&self,
 		_browser: Option<&mut Browser>,