mirror of
https://github.com/infinilabs/coco-app.git
synced 2025-12-24 07:19:23 +01:00
Compare commits
4 Commits
add-search
...
abled-1215
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
06da6c941e | ||
|
|
26386ec295 | ||
|
|
f483ce4887 | ||
|
|
cc72c59894 |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -29,4 +29,4 @@ web.md
|
||||
*.sw?
|
||||
.env
|
||||
|
||||
.trae
|
||||
.trae
|
||||
|
||||
@@ -13,6 +13,7 @@ Information about release notes of Coco App is provided here.
|
||||
|
||||
### 🚀 Features
|
||||
|
||||
- feat: resizable extension UI #1009
|
||||
- feat: add open button to launch installed extension #1013
|
||||
|
||||
### 🐛 Bug fix
|
||||
|
||||
12
src-tauri/Cargo.lock
generated
12
src-tauri/Cargo.lock
generated
@@ -1184,6 +1184,7 @@ dependencies = [
|
||||
"scraper",
|
||||
"semver",
|
||||
"serde",
|
||||
"serde-inline-default",
|
||||
"serde_json",
|
||||
"serde_plain",
|
||||
"snafu",
|
||||
@@ -6308,6 +6309,17 @@ dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde-inline-default"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "92d48532bc0781ac622a5fea0f16502d3b4f1af0fcebe56d618120969f35d315"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.111",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde-untagged"
|
||||
version = "0.1.9"
|
||||
|
||||
@@ -122,6 +122,7 @@ actix-web = "4.11.0"
|
||||
tauri-plugin-clipboard-manager = "2"
|
||||
tauri-plugin-zustand = "1"
|
||||
snafu = "0.8.9"
|
||||
serde-inline-default = "1.0.0"
|
||||
|
||||
[dev-dependencies]
|
||||
tempfile = "3.23.0"
|
||||
|
||||
@@ -36,6 +36,8 @@
|
||||
<string>Coco AI needs access to your microphone for voice input and audio recording features.</string>
|
||||
<key>NSCameraUsageDescription</key>
|
||||
<string>Coco AI requires camera access for scanning documents and capturing images.</string>
|
||||
<key>NSCameraUseContinuityCameraDeviceType</key>
|
||||
<true/>
|
||||
<key>NSSpeechRecognitionUsageDescription</key>
|
||||
<string>Coco AI uses speech recognition to convert your voice into text for a hands-free experience.</string>
|
||||
<key>NSAppleEventsUsageDescription</key>
|
||||
@@ -43,4 +45,4 @@
|
||||
<key>NSAccessibility</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</plist>
|
||||
</plist>
|
||||
|
||||
@@ -31,6 +31,11 @@
|
||||
"core:window:deny-internal-toggle-maximize",
|
||||
"core:window:allow-set-shadow",
|
||||
"core:window:allow-set-position",
|
||||
"core:window:allow-set-theme",
|
||||
"core:window:allow-unminimize",
|
||||
"core:window:allow-set-fullscreen",
|
||||
"core:window:allow-set-resizable",
|
||||
"core:window:allow-maximize",
|
||||
"core:app:allow-set-app-theme",
|
||||
"shell:default",
|
||||
"http:default",
|
||||
@@ -65,12 +70,10 @@
|
||||
"fs-pro:default",
|
||||
"macos-permissions:default",
|
||||
"screenshots:default",
|
||||
"core:window:allow-set-theme",
|
||||
"process:default",
|
||||
"updater:default",
|
||||
"windows-version:default",
|
||||
"log:default",
|
||||
"opener:default",
|
||||
"core:window:allow-unminimize"
|
||||
"opener:default"
|
||||
]
|
||||
}
|
||||
|
||||
@@ -152,14 +152,31 @@ pub struct Extension {
|
||||
}
|
||||
|
||||
/// Settings that control the built-in UI Components
|
||||
#[serde_inline_default::serde_inline_default]
|
||||
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq)]
|
||||
pub(crate) struct ViewExtensionUISettings {
|
||||
/// Show the search bar
|
||||
#[serde_inline_default(true)]
|
||||
search_bar: bool,
|
||||
/// Show the filter bar
|
||||
#[serde_inline_default(true)]
|
||||
filter_bar: bool,
|
||||
/// Show the footer
|
||||
#[serde_inline_default(true)]
|
||||
footer: bool,
|
||||
/// The recommended width of the window for this extension
|
||||
width: Option<u32>,
|
||||
/// The recommended heigh of the window for this extension
|
||||
height: Option<u32>,
|
||||
/// Is the extension window's size adjustable?
|
||||
#[serde_inline_default(false)]
|
||||
resizable: bool,
|
||||
/// Detch the extension window from Coco's main window.
|
||||
///
|
||||
/// If true, user can click the detach button to open this
|
||||
/// extension in a seprate window.
|
||||
#[serde_inline_default(false)]
|
||||
detachable: bool,
|
||||
}
|
||||
|
||||
/// Bundle ID uniquely identifies an extension.
|
||||
|
||||
@@ -14,8 +14,8 @@ use once_cell::sync::Lazy;
|
||||
use std::sync::Mutex;
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
|
||||
/// Global toggle: selection monitoring disabled for this release.
|
||||
static SELECTION_ENABLED: AtomicBool = AtomicBool::new(false);
|
||||
/// Global toggle: selection monitoring enabled by default.
|
||||
static SELECTION_ENABLED: AtomicBool = AtomicBool::new(true);
|
||||
|
||||
/// Ensure we only start the monitor thread once. Allows delayed start after
|
||||
/// Accessibility permission is granted post-launch.
|
||||
@@ -281,12 +281,19 @@ pub fn start_selection_monitor(app_handle: tauri::AppHandle) {
|
||||
let mut stable_text = String::new();
|
||||
let mut stable_count = 0;
|
||||
let mut empty_count = 0;
|
||||
let mut loop_idx: u64 = 0;
|
||||
|
||||
loop {
|
||||
loop_idx = loop_idx.wrapping_add(1);
|
||||
let verbose = loop_idx % 50 == 0; // Log roughly every 1.5s (30ms * 50)
|
||||
|
||||
std::thread::sleep(Duration::from_millis(30));
|
||||
|
||||
// If disabled: do not read AX / do not show popup; hide if currently visible.
|
||||
if !is_selection_enabled() {
|
||||
if verbose {
|
||||
println!("[SelectionMonitor] Disabled");
|
||||
}
|
||||
if popup_visible {
|
||||
let _ = app_handle.emit("selection-detected", "");
|
||||
popup_visible = false;
|
||||
@@ -301,6 +308,13 @@ pub fn start_selection_monitor(app_handle: tauri::AppHandle) {
|
||||
// system-wide focused element belongs to this process.
|
||||
let front_is_me = is_frontmost_app_me() || is_focused_element_me();
|
||||
|
||||
if verbose {
|
||||
println!(
|
||||
"[SelectionMonitor] Loop heartbeat. front_is_me={}",
|
||||
front_is_me
|
||||
);
|
||||
}
|
||||
|
||||
// When Coco is frontmost, disable detection but do NOT hide the popup.
|
||||
// Users may be clicking the popup; we must keep it visible.
|
||||
if front_is_me {
|
||||
@@ -313,9 +327,16 @@ pub fn start_selection_monitor(app_handle: tauri::AppHandle) {
|
||||
// Lightweight retries to smooth out transient AX focus instability.
|
||||
let selected_text = {
|
||||
// Up to 2 retries, 35ms apart.
|
||||
read_selected_text_with_retries(2, 35)
|
||||
read_selected_text_with_retries(2, 35, verbose)
|
||||
};
|
||||
|
||||
if verbose {
|
||||
println!(
|
||||
"[SelectionMonitor] read_selected_text result: {:?}",
|
||||
selected_text
|
||||
);
|
||||
}
|
||||
|
||||
match selected_text {
|
||||
Some(text) if !text.is_empty() => {
|
||||
empty_count = 0;
|
||||
@@ -425,6 +446,7 @@ fn ensure_accessibility_permission(app_handle: &tauri::AppHandle) -> bool {
|
||||
}
|
||||
|
||||
// Still not trusted — notify frontend and deep-link to settings.
|
||||
println!("[SelectionMonitor] Accessibility permission NOT granted. Opening System Settings...");
|
||||
let _ = app_handle.emit("selection-permission-required", true);
|
||||
log::debug!(target: "coco_lib::selection_monitor", "selection-permission-required emitted");
|
||||
|
||||
@@ -563,12 +585,16 @@ fn is_focused_element_me() -> bool {
|
||||
/// Read the selected text of the frontmost application (without using the clipboard).
|
||||
/// macOS only. Returns `None` when the frontmost app is Coco to avoid false empties.
|
||||
#[cfg(target_os = "macos")]
|
||||
fn read_selected_text() -> Option<String> {
|
||||
fn read_selected_text(verbose: bool) -> Option<String> {
|
||||
use objc2_app_kit::NSWorkspace;
|
||||
use objc2_application_services::{AXError, AXUIElement};
|
||||
use objc2_core_foundation::{CFRetained, CFString, CFType};
|
||||
use std::ptr::NonNull;
|
||||
|
||||
if verbose {
|
||||
println!("[SelectionMonitor] read_selected_text: Attempting to read...");
|
||||
}
|
||||
|
||||
// Prefer system-wide focused element; if unavailable, fall back to app/window focused element.
|
||||
let mut focused_ui_ptr: *const CFType = std::ptr::null();
|
||||
let focused_attr = CFString::from_static_str("AXFocusedUIElement");
|
||||
@@ -583,12 +609,23 @@ fn read_selected_text() -> Option<String> {
|
||||
.copy_attribute_value(&focused_attr, NonNull::new(&mut focused_ui_ptr).unwrap())
|
||||
};
|
||||
if err != AXError::Success {
|
||||
if verbose {
|
||||
println!(
|
||||
"[SelectionMonitor] Failed to get AXFocusedUIElement from system wide element: {:?}",
|
||||
err
|
||||
);
|
||||
}
|
||||
focused_ui_ptr = std::ptr::null();
|
||||
}
|
||||
} else if verbose {
|
||||
println!("[SelectionMonitor] AXUIElementCreateSystemWide returned null");
|
||||
}
|
||||
|
||||
// Fallback to the frontmost app's focused/window element.
|
||||
if focused_ui_ptr.is_null() {
|
||||
if verbose {
|
||||
println!("[SelectionMonitor] System-wide focus not found, trying frontmost app...");
|
||||
}
|
||||
let workspace = unsafe { NSWorkspace::sharedWorkspace() };
|
||||
let frontmost_app = unsafe { workspace.frontmostApplication() }?;
|
||||
let pid = unsafe { frontmost_app.processIdentifier() };
|
||||
@@ -596,6 +633,9 @@ fn read_selected_text() -> Option<String> {
|
||||
// Skip if frontmost is Coco (this process).
|
||||
let my_pid = std::process::id() as i32;
|
||||
if pid == my_pid {
|
||||
if verbose {
|
||||
println!("[SelectionMonitor] Frontmost app is Coco, skipping.");
|
||||
}
|
||||
return None;
|
||||
}
|
||||
|
||||
@@ -605,6 +645,12 @@ fn read_selected_text() -> Option<String> {
|
||||
.copy_attribute_value(&focused_attr, NonNull::new(&mut focused_ui_ptr).unwrap())
|
||||
};
|
||||
if err != AXError::Success || focused_ui_ptr.is_null() {
|
||||
if verbose {
|
||||
println!(
|
||||
"[SelectionMonitor] Failed to get AXFocusedUIElement from app (pid={}), trying AXFocusedWindow...",
|
||||
pid
|
||||
);
|
||||
}
|
||||
// Try `AXFocusedWindow` as a lightweight fallback.
|
||||
let mut focused_window_ptr: *const CFType = std::ptr::null();
|
||||
let focused_window_attr = CFString::from_static_str("AXFocusedWindow");
|
||||
@@ -615,9 +661,41 @@ fn read_selected_text() -> Option<String> {
|
||||
)
|
||||
};
|
||||
if w_err != AXError::Success || focused_window_ptr.is_null() {
|
||||
if verbose {
|
||||
println!(
|
||||
"[SelectionMonitor] Failed to get AXFocusedWindow from app (pid={})",
|
||||
pid
|
||||
);
|
||||
}
|
||||
return None;
|
||||
}
|
||||
focused_ui_ptr = focused_window_ptr;
|
||||
let focused_window_elem: CFRetained<AXUIElement> = unsafe {
|
||||
CFRetained::from_raw(
|
||||
NonNull::new(focused_window_ptr.cast::<AXUIElement>().cast_mut()).unwrap(),
|
||||
)
|
||||
};
|
||||
let mut inner_focused_ptr: *const CFType = std::ptr::null();
|
||||
let w_focused_err = unsafe {
|
||||
focused_window_elem.copy_attribute_value(
|
||||
&focused_attr,
|
||||
NonNull::new(&mut inner_focused_ptr).unwrap(),
|
||||
)
|
||||
};
|
||||
if w_focused_err == AXError::Success && !inner_focused_ptr.is_null() {
|
||||
if verbose {
|
||||
println!(
|
||||
"[SelectionMonitor] Resolved AXFocusedUIElement via AXFocusedWindow (pid={})",
|
||||
pid
|
||||
);
|
||||
}
|
||||
focused_ui_ptr = inner_focused_ptr;
|
||||
} else if verbose {
|
||||
println!(
|
||||
"[SelectionMonitor] Failed to get AXFocusedUIElement from focused window (pid={}), err={:?}",
|
||||
pid, w_focused_err
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -635,6 +713,12 @@ fn read_selected_text() -> Option<String> {
|
||||
)
|
||||
};
|
||||
if err != AXError::Success || selected_text_ptr.is_null() {
|
||||
if verbose {
|
||||
println!(
|
||||
"[SelectionMonitor] Failed to get AXSelectedText (err={:?})",
|
||||
err
|
||||
);
|
||||
}
|
||||
return None;
|
||||
}
|
||||
|
||||
@@ -643,27 +727,40 @@ fn read_selected_text() -> Option<String> {
|
||||
CFRetained::from_raw(NonNull::new(selected_text_ptr.cast::<CFString>().cast_mut()).unwrap())
|
||||
};
|
||||
|
||||
Some(selected_cfstr.to_string())
|
||||
let s = selected_cfstr.to_string();
|
||||
if verbose {
|
||||
println!("[SelectionMonitor] Success! Found text length: {}", s.len());
|
||||
}
|
||||
Some(s)
|
||||
}
|
||||
|
||||
/// Read selected text with lightweight retries to handle transient AX focus instability.
|
||||
#[cfg(target_os = "macos")]
|
||||
fn read_selected_text_with_retries(retries: u32, delay_ms: u64) -> Option<String> {
|
||||
fn read_selected_text_with_retries(retries: u32, delay_ms: u64, verbose: bool) -> Option<String> {
|
||||
use std::thread;
|
||||
use std::time::Duration;
|
||||
for attempt in 0..=retries {
|
||||
if let Some(text) = read_selected_text() {
|
||||
if let Some(text) = read_selected_text(verbose) {
|
||||
if !text.is_empty() {
|
||||
if attempt > 0 {
|
||||
// log::info!(
|
||||
// "read_selected_text: 第{}次重试成功,获取到选中文本",
|
||||
// attempt
|
||||
// );
|
||||
log::info!(
|
||||
"read_selected_text: 第{}次重试成功,获取到选中文本",
|
||||
attempt
|
||||
);
|
||||
if verbose {
|
||||
println!("[SelectionMonitor] Retry success on attempt {}", attempt);
|
||||
}
|
||||
}
|
||||
return Some(text);
|
||||
}
|
||||
}
|
||||
if attempt < retries {
|
||||
if verbose {
|
||||
println!(
|
||||
"[SelectionMonitor] Attempt {} failed/empty, retrying...",
|
||||
attempt
|
||||
);
|
||||
}
|
||||
thread::sleep(Duration::from_millis(delay_ms));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ pub fn platform(
|
||||
let panel = main_window.to_panel::<NsPanel>().unwrap();
|
||||
|
||||
// set level
|
||||
panel.set_level(PanelLevel::Utility.value());
|
||||
panel.set_level(PanelLevel::Dock.value());
|
||||
|
||||
// Do not steal focus from other windows
|
||||
panel.set_style_mask(StyleMask::empty().nonactivating_panel().into());
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
"width": 680,
|
||||
"decorations": false,
|
||||
"minimizable": false,
|
||||
"maximizable": false,
|
||||
"maximizable": true,
|
||||
"skipTaskbar": true,
|
||||
"resizable": false,
|
||||
"acceptFirstMouse": true,
|
||||
|
||||
@@ -57,13 +57,13 @@ const ErrorNotification = ({
|
||||
>
|
||||
<div className="flex items-center">
|
||||
{visibleError.type === "error" && (
|
||||
<AlertCircle className="w-5 h-5 text-red-500 mr-2" />
|
||||
<AlertCircle className="size-5 shrink-0 text-red-500 mr-2" />
|
||||
)}
|
||||
{visibleError.type === "warning" && (
|
||||
<AlertTriangle className="w-5 h-5 text-yellow-500 mr-2" />
|
||||
<AlertTriangle className="size-5 shrink-0 text-yellow-500 mr-2" />
|
||||
)}
|
||||
{visibleError.type === "info" && (
|
||||
<Info className="w-5 h-5 text-blue-500 mr-2" />
|
||||
<Info className="size-5 shrink-0 text-blue-500 mr-2" />
|
||||
)}
|
||||
|
||||
<span className="text-sm text-gray-700 dark:text-gray-200">
|
||||
@@ -78,7 +78,7 @@ const ErrorNotification = ({
|
||||
</div>
|
||||
|
||||
<X
|
||||
className="w-5 h-5 ml-4 cursor-pointer text-gray-400 hover:text-gray-600"
|
||||
className="size-5 shrink-0 ml-4 cursor-pointer text-gray-400 hover:text-gray-600"
|
||||
onClick={() => removeError(visibleError.id)}
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { useCallback, useRef, useMemo, useState, useEffect } from "react";
|
||||
import { cloneDeep, isEmpty } from "lodash-es";
|
||||
import { useKeyPress } from "ahooks";
|
||||
|
||||
import { useSearchStore } from "@/stores/searchStore";
|
||||
import { useExtensionsStore } from "@/stores/extensionsStore";
|
||||
@@ -8,7 +9,6 @@ import { Get } from "@/api/axiosRequest";
|
||||
import type { Assistant } from "@/types/chat";
|
||||
import { useAppStore } from "@/stores/appStore";
|
||||
import { canNavigateBack, navigateBack } from "@/utils";
|
||||
import { useKeyPress } from "ahooks";
|
||||
import { useShortcutsStore } from "@/stores/shortcutsStore";
|
||||
|
||||
interface AssistantManagerProps {
|
||||
@@ -167,7 +167,7 @@ export function useAssistantManager({
|
||||
const { selectedSearchContent, visibleExtensionStore } =
|
||||
useSearchStore.getState();
|
||||
|
||||
console.log("selectedSearchContent", selectedSearchContent);
|
||||
// console.log("selectedSearchContent", selectedSearchContent);
|
||||
|
||||
const { id, type, category } = selectedSearchContent ?? {};
|
||||
|
||||
|
||||
@@ -118,7 +118,7 @@ const ExtensionDetail: FC<ExtensionDetailProps> = (props) => {
|
||||
</div>
|
||||
<div className="flex items-center gap-1">
|
||||
<FolderDown className="size-4" />
|
||||
<span>{selectedExtension.stats.installs}</span>
|
||||
<span>{selectedExtension.stats?.installs ?? 0}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -348,7 +348,7 @@ const ExtensionStore = ({
|
||||
|
||||
<div className="flex items-center gap-1 text-[#999]">
|
||||
<FolderDown className="size-4" />
|
||||
<span>{stats.installs}</span>
|
||||
<span>{stats?.installs ?? 0}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -14,7 +14,7 @@ import { useShortcutsStore } from "@/stores/shortcutsStore";
|
||||
import { useAppStore } from "@/stores/appStore";
|
||||
import { useSearchStore } from "@/stores/searchStore";
|
||||
import { useExtensionsStore } from "@/stores/extensionsStore";
|
||||
import { parseSearchQuery, SearchQuery } from "@/utils";
|
||||
import { parseSearchQuery, SearchQuery, canNavigateBack } from "@/utils";
|
||||
import InputUpload from "./InputUpload";
|
||||
import Copyright from "../Common/Copyright";
|
||||
|
||||
@@ -283,7 +283,7 @@ const InputControls = ({
|
||||
</div>
|
||||
)}
|
||||
|
||||
{isChatPage || hasModules?.length !== 2 ? null : (
|
||||
{isChatPage || hasModules?.length !== 2 || canNavigateBack() ? null : (
|
||||
<div className="relative w-16 flex justify-end items-center">
|
||||
<div className="absolute right-[52px] -top-2 z-10">
|
||||
<VisibleKey
|
||||
|
||||
@@ -1,19 +1,47 @@
|
||||
import React from "react";
|
||||
import { useState, useEffect, useMemo } from "react";
|
||||
import { useState, useEffect, useMemo, useRef, useCallback } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Maximize2, Minimize2, Focus } from "lucide-react";
|
||||
|
||||
import { useSearchStore } from "@/stores/searchStore";
|
||||
import {
|
||||
ExtensionFileSystemPermission,
|
||||
FileSystemAccess,
|
||||
ViewExtensionUISettings,
|
||||
} from "../Settings/Extensions";
|
||||
import platformAdapter from "@/utils/platformAdapter";
|
||||
import { useShortcutsStore } from "@/stores/shortcutsStore";
|
||||
import { isMac } from "@/utils/platform";
|
||||
import { useAppStore } from "@/stores/appStore";
|
||||
|
||||
const ViewExtension: React.FC = () => {
|
||||
const { viewExtensionOpened } = useSearchStore();
|
||||
|
||||
const isTauri = useAppStore((state) => state.isTauri);
|
||||
|
||||
// Complete list of the backend APIs, grouped by their category.
|
||||
const [apis, setApis] = useState<Map<string, string[]> | null>(null);
|
||||
const { setModifierKeyPressed } = useShortcutsStore();
|
||||
const { t } = useTranslation();
|
||||
const [isFullscreen, setIsFullscreen] = useState(false);
|
||||
const prevWindowRef = useRef<{
|
||||
width: number;
|
||||
height: number;
|
||||
resizable: boolean;
|
||||
x: number;
|
||||
y: number;
|
||||
} | null>(null);
|
||||
const fullscreenPrevRef = useRef<{
|
||||
width: number;
|
||||
height: number;
|
||||
resizable: boolean;
|
||||
x: number;
|
||||
y: number;
|
||||
} | null>(null);
|
||||
const iframeRef = useRef<HTMLIFrameElement | null>(null);
|
||||
const DEFAULT_VIEW_WIDTH = 1200;
|
||||
const DEFAULT_VIEW_HEIGHT = 900;
|
||||
const [scale, setScale] = useState(1);
|
||||
|
||||
if (viewExtensionOpened == null) {
|
||||
// When this view gets loaded, this state should not be NULL.
|
||||
@@ -156,7 +184,6 @@ const ViewExtension: React.FC = () => {
|
||||
}
|
||||
};
|
||||
window.addEventListener("message", messageHandler);
|
||||
console.info("Coco extension API listener is up");
|
||||
|
||||
return () => {
|
||||
window.removeEventListener("message", messageHandler);
|
||||
@@ -164,15 +191,233 @@ const ViewExtension: React.FC = () => {
|
||||
}, [reversedApis, permission]); // Add apiPermissions as dependency
|
||||
|
||||
const fileUrl = viewExtensionOpened[2];
|
||||
const ui: ViewExtensionUISettings | undefined = useMemo(() => {
|
||||
return viewExtensionOpened[4] as ViewExtensionUISettings | undefined;
|
||||
}, [viewExtensionOpened]);
|
||||
const resizable = ui?.resizable;
|
||||
|
||||
const baseWidth = useMemo(() => {
|
||||
return ui && typeof ui?.width === "number" ? ui.width : DEFAULT_VIEW_WIDTH;
|
||||
}, [ui]);
|
||||
const baseHeight = useMemo(() => {
|
||||
return ui && typeof ui?.height === "number" ? ui.height : DEFAULT_VIEW_HEIGHT;
|
||||
}, [ui]);
|
||||
|
||||
const recomputeScale = useCallback(async () => {
|
||||
const size = await platformAdapter.getWindowSize();
|
||||
const nextScale = Math.min(size.width / baseWidth, size.height / baseHeight);
|
||||
setScale(Math.max(nextScale, 0.1));
|
||||
}, [baseWidth, baseHeight]);
|
||||
|
||||
const applyFullscreen = useCallback(
|
||||
async (next: boolean) => {
|
||||
if (next) {
|
||||
const size = await platformAdapter.getWindowSize();
|
||||
const resizable = await platformAdapter.isWindowResizable();
|
||||
const pos = await platformAdapter.getWindowPosition();
|
||||
fullscreenPrevRef.current = {
|
||||
width: size.width,
|
||||
height: size.height,
|
||||
resizable,
|
||||
x: pos.x,
|
||||
y: pos.y,
|
||||
};
|
||||
|
||||
if (isMac && isTauri) {
|
||||
const monitor = await platformAdapter.getMonitorFromCursor();
|
||||
|
||||
if (!monitor) return;
|
||||
const window = await platformAdapter.getCurrentWebviewWindow();
|
||||
const factor = await window.scaleFactor();
|
||||
|
||||
const { size, position } = monitor;
|
||||
|
||||
const { width, height } = size.toLogical(factor);
|
||||
const { x, y } = position.toLogical(factor);
|
||||
|
||||
await platformAdapter.setWindowSize(width, height);
|
||||
await platformAdapter.setWindowPosition(x, y);
|
||||
await platformAdapter.setWindowResizable(true);
|
||||
await recomputeScale();
|
||||
} else {
|
||||
await platformAdapter.setWindowFullscreen(true);
|
||||
await recomputeScale();
|
||||
}
|
||||
} else {
|
||||
if (!isMac) {
|
||||
await platformAdapter.setWindowFullscreen(false);
|
||||
}
|
||||
const nextWidth =
|
||||
ui && typeof ui.width === "number" ? ui.width : DEFAULT_VIEW_WIDTH;
|
||||
const nextHeight =
|
||||
ui && typeof ui.height === "number" ? ui.height : DEFAULT_VIEW_HEIGHT;
|
||||
const nextResizable =
|
||||
ui && typeof ui.resizable === "boolean" ? ui.resizable : true;
|
||||
await platformAdapter.setWindowSize(nextWidth, nextHeight);
|
||||
await platformAdapter.setWindowResizable(nextResizable);
|
||||
await platformAdapter.centerOnCurrentMonitor();
|
||||
await recomputeScale();
|
||||
setTimeout(() => {
|
||||
iframeRef.current?.focus();
|
||||
try {
|
||||
iframeRef.current?.contentWindow?.focus();
|
||||
} catch {}
|
||||
}, 0);
|
||||
}
|
||||
},
|
||||
[ui, recomputeScale]
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
const applyWindowSettings = async () => {
|
||||
if (viewExtensionOpened != null) {
|
||||
const size = await platformAdapter.getWindowSize();
|
||||
const resizable = await platformAdapter.isWindowResizable();
|
||||
const pos = await platformAdapter.getWindowPosition();
|
||||
prevWindowRef.current = {
|
||||
width: size.width,
|
||||
height: size.height,
|
||||
resizable,
|
||||
x: pos.x,
|
||||
y: pos.y,
|
||||
};
|
||||
|
||||
const nextWidth =
|
||||
ui && typeof ui.width === "number" ? ui.width : DEFAULT_VIEW_WIDTH;
|
||||
const nextHeight =
|
||||
ui && typeof ui.height === "number" ? ui.height : DEFAULT_VIEW_HEIGHT;
|
||||
const nextResizable =
|
||||
ui && typeof ui.resizable === "boolean" ? ui.resizable : true;
|
||||
|
||||
await platformAdapter.setWindowSize(nextWidth, nextHeight);
|
||||
await platformAdapter.setWindowResizable(nextResizable);
|
||||
await platformAdapter.centerOnCurrentMonitor();
|
||||
await recomputeScale();
|
||||
setTimeout(() => {
|
||||
iframeRef.current?.focus();
|
||||
try {
|
||||
iframeRef.current?.contentWindow?.focus();
|
||||
} catch {}
|
||||
}, 0);
|
||||
} else {
|
||||
if (prevWindowRef.current) {
|
||||
const prev = prevWindowRef.current;
|
||||
await platformAdapter.setWindowSize(prev.width, prev.height);
|
||||
await platformAdapter.setWindowResizable(prev.resizable);
|
||||
await platformAdapter.centerOnCurrentMonitor();
|
||||
prevWindowRef.current = null;
|
||||
await recomputeScale();
|
||||
setTimeout(() => {
|
||||
iframeRef.current?.focus();
|
||||
}, 0);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
applyWindowSettings();
|
||||
return () => {
|
||||
if (prevWindowRef.current) {
|
||||
const prev = prevWindowRef.current;
|
||||
platformAdapter.setWindowSize(prev.width, prev.height);
|
||||
platformAdapter.setWindowResizable(prev.resizable);
|
||||
platformAdapter.centerOnCurrentMonitor();
|
||||
prevWindowRef.current = null;
|
||||
}
|
||||
};
|
||||
}, [viewExtensionOpened]);
|
||||
useEffect(() => {
|
||||
const handleKeyDown = (e: KeyboardEvent) => {
|
||||
if (e.key === "Escape" && isFullscreen) {
|
||||
applyFullscreen(false);
|
||||
setIsFullscreen(false);
|
||||
}
|
||||
};
|
||||
window.addEventListener("keydown", handleKeyDown, { capture: true });
|
||||
return () => {
|
||||
window.removeEventListener("keydown", handleKeyDown, {
|
||||
capture: true,
|
||||
} as any);
|
||||
};
|
||||
}, [isFullscreen, applyFullscreen]);
|
||||
|
||||
return (
|
||||
<iframe
|
||||
src={fileUrl}
|
||||
className="w-full h-full border-0"
|
||||
onLoad={(event) => {
|
||||
event.currentTarget.focus();
|
||||
}}
|
||||
/>
|
||||
<div className="relative w-full h-full">
|
||||
{isFullscreen && <div className="absolute inset-0 pointer-events-none" />}
|
||||
{resizable && (
|
||||
<button
|
||||
aria-label={
|
||||
isFullscreen
|
||||
? t("viewExtension.fullscreen.exit")
|
||||
: t("viewExtension.fullscreen.enter")
|
||||
}
|
||||
className="absolute top-2 right-2 z-10 rounded-md bg-black/40 text-white p-2 hover:bg-black/60 focus:outline-none"
|
||||
onClick={async () => {
|
||||
const next = !isFullscreen;
|
||||
await applyFullscreen(next);
|
||||
setIsFullscreen(next);
|
||||
if (next) {
|
||||
iframeRef.current?.focus();
|
||||
try {
|
||||
iframeRef.current?.contentWindow?.focus();
|
||||
} catch {}
|
||||
}
|
||||
}}
|
||||
>
|
||||
{isFullscreen ? (
|
||||
<Minimize2 className="size-4" />
|
||||
) : (
|
||||
<Maximize2 className="size-4" />
|
||||
)}
|
||||
</button>
|
||||
)}
|
||||
{/* Focus helper button */}
|
||||
<button
|
||||
aria-label={t("viewExtension.focus")}
|
||||
className="absolute top-2 right-12 z-10 rounded-md bg-black/40 text-white p-2 hover:bg-black/60 focus:outline-none"
|
||||
onClick={() => {
|
||||
iframeRef.current?.focus();
|
||||
try {
|
||||
iframeRef.current?.contentWindow?.focus();
|
||||
} catch {}
|
||||
}}
|
||||
>
|
||||
<Focus className="size-4"/>
|
||||
</button>
|
||||
<div
|
||||
className="w-full h-full flex items-center justify-center"
|
||||
onMouseDownCapture={() => {
|
||||
iframeRef.current?.focus();
|
||||
}}
|
||||
onPointerDown={() => {
|
||||
iframeRef.current?.focus();
|
||||
}}
|
||||
onClickCapture={() => {
|
||||
iframeRef.current?.focus();
|
||||
}}
|
||||
>
|
||||
<iframe
|
||||
ref={iframeRef}
|
||||
src={fileUrl}
|
||||
className="border-0"
|
||||
style={{
|
||||
width: `${baseWidth}px`,
|
||||
height: `${baseHeight}px`,
|
||||
transform: `scale(${scale})`,
|
||||
transformOrigin: "center center",
|
||||
outline: "none",
|
||||
}}
|
||||
allow="fullscreen; pointer-lock; gamepad"
|
||||
allowFullScreen
|
||||
tabIndex={-1}
|
||||
onLoad={(event) => {
|
||||
event.currentTarget.focus();
|
||||
try {
|
||||
iframeRef.current?.contentWindow?.focus();
|
||||
} catch {}
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
|
||||
@@ -110,9 +110,13 @@ function SearchChat({
|
||||
let collapseWindowTimer = useRef<ReturnType<typeof setTimeout>>();
|
||||
|
||||
const setWindowSize = useCallback(() => {
|
||||
const { viewExtensionOpened } = useSearchStore.getState();
|
||||
if (collapseWindowTimer.current) {
|
||||
clearTimeout(collapseWindowTimer.current);
|
||||
}
|
||||
if (viewExtensionOpened != null) {
|
||||
return;
|
||||
}
|
||||
|
||||
const width = 680;
|
||||
let height = WINDOW_CENTER_BASELINE_HEIGHT;
|
||||
@@ -177,6 +181,28 @@ function SearchChat({
|
||||
onFocus: debouncedSetWindowSize,
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
const unlisten = platformAdapter.listenEvent(
|
||||
"refresh-window-size",
|
||||
() => {
|
||||
debouncedSetWindowSize();
|
||||
}
|
||||
);
|
||||
return () => {
|
||||
unlisten
|
||||
.then((fn) => {
|
||||
try {
|
||||
typeof fn === "function" && fn();
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
// ignore
|
||||
});
|
||||
};
|
||||
}, [debouncedSetWindowSize]);
|
||||
|
||||
useEffect(() => {
|
||||
dispatch({
|
||||
type: "SET_SEARCH_ACTIVE",
|
||||
@@ -386,7 +412,7 @@ function SearchChat({
|
||||
<div
|
||||
data-tauri-drag-region={isTauri}
|
||||
className={clsx(
|
||||
"m-auto overflow-hidden relative bg-no-repeat flex flex-col",
|
||||
"m-auto overflow-hidden relative bg-no-repeat flex flex-col bg-cover",
|
||||
[
|
||||
isTransitioned
|
||||
? "bg-bottom bg-[url('/assets/chat_bg_light.png')] dark:bg-[url('/assets/chat_bg_dark.png')]"
|
||||
@@ -401,7 +427,6 @@ function SearchChat({
|
||||
}
|
||||
)}
|
||||
style={{
|
||||
backgroundSize: "auto 590px",
|
||||
opacity: blurred ? blurOpacity / 100 : normalOpacity / 100,
|
||||
}}
|
||||
>
|
||||
|
||||
@@ -75,6 +75,10 @@ export interface ViewExtensionUISettings {
|
||||
search_bar: boolean;
|
||||
filter_bar: boolean;
|
||||
footer: boolean;
|
||||
width: number | null;
|
||||
height: number | null;
|
||||
resizable: boolean;
|
||||
detachable: boolean;
|
||||
}
|
||||
|
||||
export interface Extension {
|
||||
|
||||
@@ -11,6 +11,9 @@ const useEscape = () => {
|
||||
const setVisibleContextMenu = useSearchStore((state) => {
|
||||
return state.setVisibleContextMenu;
|
||||
});
|
||||
const viewExtensionOpened = useSearchStore((state) => {
|
||||
return state.viewExtensionOpened;
|
||||
});
|
||||
|
||||
useKeyPress("esc", (event) => {
|
||||
event.preventDefault();
|
||||
@@ -33,6 +36,9 @@ const useEscape = () => {
|
||||
return closeHistoryPanel();
|
||||
}
|
||||
|
||||
if (viewExtensionOpened != null) {
|
||||
return;
|
||||
}
|
||||
platformAdapter.hideWindow();
|
||||
});
|
||||
};
|
||||
|
||||
@@ -18,7 +18,7 @@ export const useTray = () => {
|
||||
const showCocoShortcuts = useAppStore((state) => state.showCocoShortcuts);
|
||||
|
||||
const selectionEnabled = useSelectionStore((state) => state.selectionEnabled);
|
||||
// const setSelectionEnabled = useSelectionStore((state) => state.setSelectionEnabled);
|
||||
const setSelectionEnabled = useSelectionStore((state) => state.setSelectionEnabled);
|
||||
|
||||
useUpdateEffect(() => {
|
||||
if (showCocoShortcuts.length === 0) return;
|
||||
@@ -65,18 +65,18 @@ export const useTray = () => {
|
||||
|
||||
itemPromises.push(PredefinedMenuItem.new({ item: "Separator" }));
|
||||
|
||||
// if (isMac) {
|
||||
// itemPromises.push(
|
||||
// MenuItem.new({
|
||||
// text: selectionEnabled
|
||||
// ? t("tray.selectionDisable")
|
||||
// : t("tray.selectionEnable"),
|
||||
// action: async () => {
|
||||
// setSelectionEnabled(!selectionEnabled);
|
||||
// },
|
||||
// })
|
||||
// );
|
||||
// }
|
||||
if (isMac) {
|
||||
itemPromises.push(
|
||||
MenuItem.new({
|
||||
text: selectionEnabled
|
||||
? t("tray.selectionDisable")
|
||||
: t("tray.selectionEnable"),
|
||||
action: async () => {
|
||||
setSelectionEnabled(!selectionEnabled);
|
||||
},
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
itemPromises.push(
|
||||
MenuItem.new({
|
||||
|
||||
@@ -626,9 +626,16 @@
|
||||
},
|
||||
"deleteDialog": {
|
||||
"title": "Uninstall",
|
||||
"description": "This will remove all the data and commands associated with this extension."
|
||||
"description": "This will delete all data and commands related to the extension."
|
||||
}
|
||||
},
|
||||
"viewExtension": {
|
||||
"fullscreen": {
|
||||
"enter": "Enter Full Screen",
|
||||
"exit": "Exit Full Screen"
|
||||
},
|
||||
"focus": "Focus"
|
||||
},
|
||||
"deleteDialog": {
|
||||
"button": {
|
||||
"cancel": "Cancel",
|
||||
|
||||
@@ -628,6 +628,13 @@
|
||||
"description": "这将删除与该扩展相关的所有数据和命令。"
|
||||
}
|
||||
},
|
||||
"viewExtension": {
|
||||
"fullscreen": {
|
||||
"enter": "进入全屏",
|
||||
"exit": "退出全屏"
|
||||
},
|
||||
"focus": "聚焦"
|
||||
},
|
||||
"deleteDialog": {
|
||||
"button": {
|
||||
"cancel": "取消",
|
||||
|
||||
@@ -18,7 +18,7 @@ import { useExtensionsStore } from "@/stores/extensionsStore";
|
||||
import { useSelectionStore, startSelectionStorePersistence } from "@/stores/selectionStore";
|
||||
import { useServers } from "@/hooks/useServers";
|
||||
import { useDeepLinkManager } from "@/hooks/useDeepLinkManager";
|
||||
// import { useSelectionWindow } from "@/hooks/useSelectionWindow";
|
||||
import { useSelectionWindow } from "@/hooks/useSelectionWindow";
|
||||
|
||||
export default function LayoutOutlet() {
|
||||
const location = useLocation();
|
||||
@@ -128,7 +128,7 @@ export default function LayoutOutlet() {
|
||||
});
|
||||
|
||||
// --- Selection window ---
|
||||
// useSelectionWindow();
|
||||
useSelectionWindow();
|
||||
|
||||
return (
|
||||
<>
|
||||
|
||||
@@ -33,7 +33,7 @@ export const useSelectionStore = create<SelectionStore>((set) => ({
|
||||
setIconsOnly: (iconsOnly) => set({ iconsOnly }),
|
||||
toolbarConfig: [],
|
||||
setToolbarConfig: (toolbarConfig) => set({ toolbarConfig }),
|
||||
selectionEnabled: false,
|
||||
selectionEnabled: true,
|
||||
setSelectionEnabled: (selectionEnabled) => set({ selectionEnabled }),
|
||||
}));
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ import { ViewExtensionOpened } from "@/stores/searchStore";
|
||||
export interface EventPayloads {
|
||||
"theme-changed": string;
|
||||
"tauri://focus": void;
|
||||
"refresh-window-size": void;
|
||||
"endpoint-changed": {
|
||||
endpoint: string;
|
||||
endpoint_http: string;
|
||||
|
||||
@@ -258,7 +258,9 @@ export const navigateBack = () => {
|
||||
}
|
||||
|
||||
if (viewExtensionOpened) {
|
||||
return setViewExtensionOpened(void 0);
|
||||
setViewExtensionOpened(void 0);
|
||||
platformAdapter.emitEvent("refresh-window-size");
|
||||
return;
|
||||
}
|
||||
|
||||
setSourceData(void 0);
|
||||
|
||||
@@ -16,8 +16,16 @@ import { useAppearanceStore } from "@/stores/appearanceStore";
|
||||
import { copyToClipboard, dispatchEvent, OpenURLWithBrowser } from ".";
|
||||
import { useAppStore } from "@/stores/appStore";
|
||||
import { unrequitable } from "@/utils";
|
||||
import { WebviewWindow } from "@tauri-apps/api/webviewWindow";
|
||||
import { Theme } from "@tauri-apps/api/window";
|
||||
import {
|
||||
getCurrentWebviewWindow,
|
||||
WebviewWindow,
|
||||
} from "@tauri-apps/api/webviewWindow";
|
||||
import {
|
||||
cursorPosition,
|
||||
Monitor,
|
||||
monitorFromPoint,
|
||||
Theme,
|
||||
} from "@tauri-apps/api/window";
|
||||
|
||||
export interface TauriPlatformAdapter extends BasePlatformAdapter {
|
||||
openFileDialog: (
|
||||
@@ -30,13 +38,65 @@ export interface TauriPlatformAdapter extends BasePlatformAdapter {
|
||||
getWindowTheme: () => Promise<Theme | null>;
|
||||
setWindowTheme: (theme: Theme | null) => Promise<void>;
|
||||
getAllWindows: () => Promise<WebviewWindow[]>;
|
||||
setWindowResizable: (resizable: boolean) => Promise<void>;
|
||||
isWindowResizable: () => Promise<boolean>;
|
||||
getWindowSize: () => Promise<{ width: number; height: number }>;
|
||||
setWindowFullscreen: (enable: boolean) => Promise<void>;
|
||||
isWindowMaximized: () => Promise<boolean>;
|
||||
setWindowMaximized: (enable: boolean) => Promise<void>;
|
||||
getWindowPosition: () => Promise<{ x: number; y: number }>;
|
||||
setWindowPosition: (x: number, y: number) => Promise<void>;
|
||||
centerWindow: () => Promise<void>;
|
||||
getMonitorFromCursor: () => Promise<Monitor | null>;
|
||||
centerOnCurrentMonitor: () => Promise<unknown>;
|
||||
}
|
||||
|
||||
// Create Tauri adapter functions
|
||||
export const createTauriAdapter = (): TauriPlatformAdapter => {
|
||||
return {
|
||||
async setWindowSize(width, height) {
|
||||
return windowWrapper.setSize(width, height);
|
||||
return windowWrapper.setLogicalSize(width, height);
|
||||
},
|
||||
async getWindowSize() {
|
||||
return windowWrapper.getLogicalSize();
|
||||
},
|
||||
async setWindowResizable(resizable) {
|
||||
return windowWrapper.setResizable(resizable);
|
||||
},
|
||||
async isWindowResizable() {
|
||||
return windowWrapper.isResizable();
|
||||
},
|
||||
async setWindowFullscreen(enable) {
|
||||
return windowWrapper.setFullscreen(enable);
|
||||
},
|
||||
async isWindowMaximized() {
|
||||
return windowWrapper.isMaximized();
|
||||
},
|
||||
async setWindowMaximized(enable) {
|
||||
return windowWrapper.setMaximized(enable);
|
||||
},
|
||||
async getWindowPosition() {
|
||||
return windowWrapper.getLogicalPosition();
|
||||
},
|
||||
async setWindowPosition(x, y) {
|
||||
return windowWrapper.setLogicalPosition(x, y);
|
||||
},
|
||||
async centerWindow() {
|
||||
return windowWrapper.center();
|
||||
},
|
||||
|
||||
async getMonitorFromCursor() {
|
||||
const appWindow = getCurrentWebviewWindow();
|
||||
const factor = await appWindow.scaleFactor();
|
||||
|
||||
const point = await cursorPosition();
|
||||
const { x, y } = point.toLogical(factor);
|
||||
|
||||
return monitorFromPoint(x, y);
|
||||
},
|
||||
|
||||
async centerOnCurrentMonitor() {
|
||||
return windowWrapper.centerOnMonitor();
|
||||
},
|
||||
|
||||
async hideWindow() {
|
||||
|
||||
@@ -12,6 +12,14 @@ export interface WebPlatformAdapter extends BasePlatformAdapter {
|
||||
getWindowTheme: () => Promise<string>;
|
||||
setWindowTheme: (theme: string | null) => Promise<void>;
|
||||
getAllWindows: () => Promise<any[]>;
|
||||
setWindowResizable: (resizable: boolean) => Promise<void>;
|
||||
isWindowResizable: () => Promise<boolean>;
|
||||
getWindowSize: () => Promise<{ width: number; height: number }>;
|
||||
setWindowFullscreen: (enable: boolean) => Promise<void>;
|
||||
getMonitorFromCursor: () => Promise<any>;
|
||||
centerOnCurrentMonitor: () => Promise<void>;
|
||||
getWindowPosition: () => Promise<{ x: number; y: number }>;
|
||||
setWindowPosition: (x: number, y: number) => Promise<void>;
|
||||
}
|
||||
|
||||
// Create Web adapter functions
|
||||
@@ -35,6 +43,46 @@ export const createWebAdapter = (): WebPlatformAdapter => {
|
||||
console.log(`Web mode simulated window resize: ${width}x${height}`);
|
||||
// No actual operation needed in web environment
|
||||
},
|
||||
async getWindowSize() {
|
||||
return { width: window.innerWidth, height: window.innerHeight };
|
||||
},
|
||||
async setWindowResizable(resizable) {
|
||||
console.log("Web mode simulated set window resizable:", resizable);
|
||||
},
|
||||
async isWindowResizable() {
|
||||
return true;
|
||||
},
|
||||
async setWindowFullscreen(enable) {
|
||||
console.log("Web mode simulated fullscreen:", enable);
|
||||
},
|
||||
async getMonitorFromCursor() {
|
||||
return {
|
||||
size: {
|
||||
toLogical: (factor: number) => ({
|
||||
width: window.innerWidth / factor,
|
||||
height: window.innerHeight / factor,
|
||||
}),
|
||||
},
|
||||
position: {
|
||||
toLogical: (factor: number) => ({
|
||||
x: window.screenX / factor,
|
||||
y: window.screenY / factor,
|
||||
}),
|
||||
},
|
||||
};
|
||||
},
|
||||
async centerOnCurrentMonitor() {
|
||||
// Not applicable in web mode
|
||||
return;
|
||||
},
|
||||
|
||||
async getWindowPosition() {
|
||||
return { x: window.screenX, y: window.screenY };
|
||||
},
|
||||
|
||||
async setWindowPosition(x, y) {
|
||||
console.log(`Web mode simulated set window position: ${x}, ${y}`);
|
||||
},
|
||||
|
||||
async hideWindow() {
|
||||
console.log("Web mode simulated window hide");
|
||||
@@ -277,4 +325,4 @@ export const createWebAdapter = (): WebPlatformAdapter => {
|
||||
return Promise.resolve();
|
||||
},
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import * as commands from "@/commands";
|
||||
import { WINDOW_CENTER_BASELINE_HEIGHT } from "@/constants";
|
||||
import platformAdapter from "../platformAdapter";
|
||||
|
||||
// Window operations
|
||||
export const windowWrapper = {
|
||||
@@ -10,7 +11,7 @@ export const windowWrapper = {
|
||||
return getCurrentWebviewWindow();
|
||||
},
|
||||
|
||||
async setSize(width: number, height: number) {
|
||||
async setLogicalSize(width: number, height: number) {
|
||||
const { LogicalSize } = await import("@tauri-apps/api/dpi");
|
||||
const window = await this.getCurrentWebviewWindow();
|
||||
if (window) {
|
||||
@@ -20,6 +21,95 @@ export const windowWrapper = {
|
||||
}
|
||||
}
|
||||
},
|
||||
async getLogicalSize() {
|
||||
const window = await this.getCurrentWebviewWindow();
|
||||
if (window) {
|
||||
const size = await window.innerSize();
|
||||
const scale = await window.scaleFactor();
|
||||
return {
|
||||
width: Math.round(size.width / scale),
|
||||
height: Math.round(size.height / scale),
|
||||
};
|
||||
}
|
||||
return { width: 0, height: 0 };
|
||||
},
|
||||
async setResizable(resizable: boolean) {
|
||||
const window = await this.getCurrentWebviewWindow();
|
||||
if (window) {
|
||||
return window.setResizable(resizable);
|
||||
}
|
||||
},
|
||||
async isResizable() {
|
||||
const window = await this.getCurrentWebviewWindow();
|
||||
if (window) {
|
||||
return window.isResizable();
|
||||
}
|
||||
return false;
|
||||
},
|
||||
async setFullscreen(enable: boolean) {
|
||||
const { getCurrentWindow } = await import("@tauri-apps/api/window");
|
||||
const win = getCurrentWindow();
|
||||
return win.setFullscreen(enable);
|
||||
},
|
||||
async center() {
|
||||
const window = await this.getCurrentWebviewWindow();
|
||||
if (window) {
|
||||
return window.center();
|
||||
}
|
||||
},
|
||||
|
||||
async setLogicalPosition(x: number, y: number) {
|
||||
const { LogicalPosition } = await import("@tauri-apps/api/dpi");
|
||||
const window = await this.getCurrentWebviewWindow();
|
||||
if (window) {
|
||||
return window.setPosition(new LogicalPosition(x, y));
|
||||
}
|
||||
},
|
||||
async getLogicalPosition() {
|
||||
const window = await this.getCurrentWebviewWindow();
|
||||
if (window) {
|
||||
const pos = await window.outerPosition();
|
||||
const scale = await window.scaleFactor();
|
||||
return { x: Math.round(pos.x / scale), y: Math.round(pos.y / scale) };
|
||||
}
|
||||
return { x: 0, y: 0 };
|
||||
},
|
||||
async centerOnMonitor() {
|
||||
const { PhysicalPosition } = await import("@tauri-apps/api/dpi");
|
||||
|
||||
const monitor = await platformAdapter.getMonitorFromCursor();
|
||||
|
||||
if (!monitor) return;
|
||||
|
||||
const window = await this.getCurrentWebviewWindow();
|
||||
|
||||
const { x: monitorX, y: monitorY } = monitor.position;
|
||||
const { width: monitorWidth, height: monitorHeight } = monitor.size;
|
||||
|
||||
const windowSize = await window.innerSize();
|
||||
|
||||
const x = monitorX + (monitorWidth - windowSize.width) / 2;
|
||||
const y = monitorY + (monitorHeight - windowSize.height) / 2;
|
||||
|
||||
return window.setPosition(new PhysicalPosition(x, y));
|
||||
},
|
||||
async isMaximized() {
|
||||
const window = await this.getCurrentWebviewWindow();
|
||||
if (window) {
|
||||
return window.isMaximized();
|
||||
}
|
||||
return false;
|
||||
},
|
||||
async setMaximized(enable: boolean) {
|
||||
const window = await this.getCurrentWebviewWindow();
|
||||
if (window) {
|
||||
if (enable) {
|
||||
return window.maximize();
|
||||
} else {
|
||||
return window.unmaximize();
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
// Event handling
|
||||
|
||||
Reference in New Issue
Block a user