Skip to content

Commit

Permalink
ci: fix macos build
Browse files Browse the repository at this point in the history
  • Loading branch information
Pylogmon committed Mar 19, 2023
1 parent d743b20 commit f541a55
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
11 changes: 8 additions & 3 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
## 0.0.15 (2023-03-14)
## 0.1.0 (2023-03-19)

### BREAK:

- 本次更新重写了设置模块,安装之后需要重新设置

### New feature:

- 添加Apple silicon支持([`db1fa50`](https://github.com/Pylogmon/pot/commit/db1fa5038e8732455481574cce9a28c131cd55cd)) (by 派了个萌)
- 设置热重载([`a2b52cd`](https://github.com/Pylogmon/Pot/commit/a2b52cd1d471cc1f029289c852e044b267e1505c)) (by 派了个萌)

### Bugs fixed:

- 修复Linux下窗口位置偏移的问题([`eee4494`](https://github.com/Pylogmon/pot/commit/eee449474e060a85580ae9c4b5716f0ffce2860e)) (by 派了个萌)
- 修复windows 高分屏窗口过小的问题([`d743b20`](https://github.com/Pylogmon/Pot/commit/d743b208d6624729e421aeec7f760feb570ee838)) (by 派了个萌)
- fix react warning([`922b267`](https://github.com/Pylogmon/Pot/commit/922b267123232681bb59b5c1170543f2f00416fc)) (by 派了个萌)
4 changes: 3 additions & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ reqwest = "0.11.14"
toml = "0.7.3"

[target.'cfg(windows)'.dependencies]
window-shadows = "0.2"
windows = {version="0.44.0",features= ["Win32_UI_WindowsAndMessaging", "Win32_Foundation","Win32_UI_HiDpi"] }
enigo = {git = "https://github.com/enigo-rs/enigo"}
cli-clipboard = "0.4.0"
window-shadows = "0.2"

[target.'cfg(target_os = "macos")'.dependencies ]
enigo = {git = "https://github.com/enigo-rs/enigo"}
cli-clipboard = "0.4.0"
window-shadows = "0.2"

[features]
Expand Down
1 change: 0 additions & 1 deletion src-tauri/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,5 @@ pub fn write_config(state: tauri::State<ConfigWrapper>) -> Result<(), String> {

#[tauri::command]
pub fn get_config_str(state: tauri::State<ConfigWrapper>) -> Table {
println!("{:?}", state.0.lock().unwrap().config_toml);
return state.0.lock().unwrap().config_toml.clone();
}
4 changes: 3 additions & 1 deletion src-tauri/src/window.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
use crate::APP;
use tauri::Manager;
#[cfg(any(target_os = "linux", target_os = "windows"))]
use tauri::PhysicalPosition;
#[cfg(any(target_os = "macos", target_os = "linux"))]
use tauri::WindowEvent;
use tauri::{Manager, PhysicalPosition};
#[cfg(any(target_os = "macos", target_os = "windows"))]
use window_shadows::set_shadow;

Expand Down

0 comments on commit f541a55

Please sign in to comment.