Skip to content

Commit e8a7fe0

Browse files
committed
fix: scale factor
1 parent 77494fe commit e8a7fe0

File tree

9 files changed

+885
-151
lines changed

9 files changed

+885
-151
lines changed

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
"eslint-plugin-vue": "^9.30.0",
4646
"jsdom": "^25.0.1",
4747
"json-formatter-js": "^2.5.18",
48+
"naive-ui": "^2.41.0",
4849
"npm-run-all2": "^7.0.1",
4950
"oxlint": "^0.11.0",
5051
"pinia": "^2.3.0",
@@ -55,6 +56,8 @@
5556
"sass-embedded": "^1.80.2",
5657
"typescript": "~5.6.3",
5758
"unocss": "^0.65.2",
59+
"unplugin-auto-import": "^19.2.0",
60+
"unplugin-vue-components": "^28.5.0",
5861
"vite": "^6.0.1",
5962
"vite-plugin-vue-devtools": "^7.6.5",
6063
"vitest": "^2.1.5",

pnpm-lock.yaml

Lines changed: 359 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src-tauri/src/tabs.rs

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
use std::sync::Mutex;
22

33
use serde::{Deserialize, Serialize};
4-
use tauri::{webview, LogicalPosition, LogicalSize, Manager, Result};
4+
use tauri::{
5+
webview, LogicalPosition, LogicalSize, Manager, Result,
6+
};
57

68
use crate::{api::resp::Response, r_ok};
79
#[derive(Default, Serialize, Deserialize, Eq, PartialEq, Debug, Clone)]
810
pub struct Tab {
911
pub id: String,
1012
pub name: Option<String>,
1113
}
12-
static TAB_BAR_HEIGHT: u32 = 50;
14+
static TAB_BAR_HEIGHT: f64 = 50.;
1315
#[tauri::command]
1416
pub async fn tab_change(app: tauri::AppHandle, tab: Tab) -> Result<Response<()>> {
1517
// first we should check webview is created? if it has, show it hidden others.
@@ -34,10 +36,12 @@ pub async fn tab_change(app: tauri::AppHandle, tab: Tab) -> Result<Response<()>>
3436
&tab.id,
3537
tauri::WebviewUrl::App(format!("/#/tab/{}/main/info", &tab.id).parse().unwrap()),
3638
);
37-
let size = view.inner_size()?;
39+
let fac = view.current_monitor()?.unwrap().scale_factor();
40+
let size = view.inner_size()?.to_logical::<f64>(fac);
41+
println!("{:#?}", size);
3842
view.add_child(
3943
v,
40-
LogicalPosition::new(0, TAB_BAR_HEIGHT),
44+
LogicalPosition::<f64>::new(0., TAB_BAR_HEIGHT),
4145
LogicalSize::new(size.width, size.height - TAB_BAR_HEIGHT),
4246
)?;
4347
// here we hide other views
@@ -60,8 +64,9 @@ pub async fn tab_change(app: tauri::AppHandle, tab: Tab) -> Result<Response<()>>
6064
if tab.id == "main" {
6165
return Ok(r_ok!((), None));
6266
}
63-
vb.set_position(LogicalPosition::new(0, TAB_BAR_HEIGHT))?;
64-
let size = view.inner_size()?;
67+
vb.set_position(LogicalPosition::<f64>::new(0., TAB_BAR_HEIGHT))?;
68+
let fac = view.current_monitor()?.unwrap().scale_factor();
69+
let size = view.inner_size()?.to_logical::<f64>(fac);
6570
vb.set_size(LogicalSize::new(size.width, size.height - TAB_BAR_HEIGHT))?;
6671
vb.show()?;
6772
}
@@ -116,8 +121,9 @@ pub async fn tab_view_resize(app: tauri::AppHandle, id: String) -> Result<Respon
116121
if let Some(vb) = app.app_handle().get_webview(&id) {
117122
// first we should check webview is created? if it has, show it and hidden others.
118123
let view = app.app_handle().get_window("main").unwrap();
119-
vb.set_position(LogicalPosition::new(0, TAB_BAR_HEIGHT))?;
120-
let size = view.inner_size()?;
124+
vb.set_position(LogicalPosition::new(0., TAB_BAR_HEIGHT))?;
125+
let fac = view.current_monitor()?.unwrap().scale_factor();
126+
let size = view.inner_size()?.to_logical::<f64>(fac);
121127
vb.set_size(LogicalSize::new(size.width, size.height - TAB_BAR_HEIGHT))?;
122128
vb.show()?;
123129
}

src/pages/host/components/CoDatabase/index.vue

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)