landaiqing/voidraft
1
1
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 18 Wiki Activity

🐛 Fixed the window toggle maximise issue

Browse Source
This commit is contained in:
landaiqing
2025-08-17 14:51:39 +08:00
parent f37c659c89
commit 5b88efcfbe
34 changed files with 556 additions and 796 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/services/backup_service.go
View File

@@ -30,14 +30,14 @@ type BackupService struct {
configService *ConfigService
dbService *DatabaseService
repository *git.Repository
logger *log.Service
logger *log.LogService
isInitialized bool
autoBackupTicker *time.Ticker
autoBackupStop chan bool
}
// NewBackupService 创建新的备份服务实例
func NewBackupService(configService *ConfigService, dbService *DatabaseService, logger *log.Service) *BackupService {
func NewBackupService(configService *ConfigService, dbService *DatabaseService, logger *log.LogService) *BackupService {
return &BackupService{
configService: configService,
dbService: dbService,

6
internal/services/config_migration_service.go
View File

@@ -38,7 +38,7 @@ type Migratable interface {
// ConfigMigrationService 配置迁移服务
type ConfigMigrationService[T Migratable] struct {
logger *log.Service
logger *log.LogService
configDir string
configName string
targetVersion string
@@ -54,7 +54,7 @@ type MigrationResult struct {
// NewConfigMigrationService 创建配置迁移服务
func NewConfigMigrationService[T Migratable](
logger *log.Service,
logger *log.LogService,
configDir string,
configName, targetVersion, configPath string,
) *ConfigMigrationService[T] {
@@ -312,7 +312,7 @@ func chainLoad(k *koanf.Koanf, loaders ...func() error) error {
}
// 工厂函数
func NewAppConfigMigrationService(logger *log.Service, configDir, settingsPath string) *ConfigMigrationService[*models.AppConfig] {
func NewAppConfigMigrationService(logger *log.LogService, configDir, settingsPath string) *ConfigMigrationService[*models.AppConfig] {
return NewConfigMigrationService[*models.AppConfig](
logger, configDir, "settings", CurrentAppConfigVersion, settingsPath)
}

4
internal/services/config_notification_service.go
View File

@@ -51,7 +51,7 @@ type ConfigListener struct {
type ConfigNotificationService struct {
listeners map[ConfigChangeType][]*ConfigListener // 支持多监听器的map
mu sync.RWMutex // 监听器map的读写锁
logger *log.Service // 日志服务
logger *log.LogService // 日志服务
koanf *koanf.Koanf // koanf实例
ctx context.Context
cancel context.CancelFunc
@@ -59,7 +59,7 @@ type ConfigNotificationService struct {
}
// NewConfigNotificationService 创建配置通知服务
func NewConfigNotificationService(k *koanf.Koanf, logger *log.Service) *ConfigNotificationService {
func NewConfigNotificationService(k *koanf.Koanf, logger *log.LogService) *ConfigNotificationService {
ctx, cancel := context.WithCancel(context.Background())
return &ConfigNotificationService{
listeners: make(map[ConfigChangeType][]*ConfigListener),

14
internal/services/config_service.go
View File

@@ -18,12 +18,12 @@ import (
// ConfigService 应用配置服务
type ConfigService struct {
koanf *koanf.Koanf // koanf 实例
logger *log.Service // 日志服务
configDir string // 配置目录
settingsPath string // 设置文件路径
mu sync.RWMutex // 读写锁
fileProvider *file.File // 文件提供器，用于监听
koanf *koanf.Koanf // koanf 实例
logger *log.LogService // 日志服务
configDir string // 配置目录
settingsPath string // 设置文件路径
mu sync.RWMutex // 读写锁
fileProvider *file.File // 文件提供器，用于监听
// 配置通知服务
notificationService *ConfigNotificationService
@@ -55,7 +55,7 @@ func (e *ConfigError) Is(target error) bool {
}
// NewConfigService 创建新的配置服务实例
func NewConfigService(logger *log.Service) *ConfigService {
func NewConfigService(logger *log.LogService) *ConfigService {
// 获取用户主目录
homeDir, err := os.UserHomeDir()
if err != nil {

4
internal/services/database_service.go
View File

@@ -80,7 +80,7 @@ type TableModel struct {
// DatabaseService provides shared database functionality
type DatabaseService struct {
configService *ConfigService
logger *log.Service
logger *log.LogService
db *sql.DB
mu sync.RWMutex
ctx context.Context
@@ -88,7 +88,7 @@ type DatabaseService struct {
}
// NewDatabaseService creates a new database service
func NewDatabaseService(configService *ConfigService, logger *log.Service) *DatabaseService {
func NewDatabaseService(configService *ConfigService, logger *log.LogService) *DatabaseService {
if logger == nil {
logger = log.New()
}

4
internal/services/dialog_service.go
View File

@@ -7,12 +7,12 @@ import (
// DialogService 对话框服务，处理文件选择等对话框操作
type DialogService struct {
logger *log.Service
logger *log.LogService
window *application.WebviewWindow // 绑定的窗口
}
// NewDialogService 创建新的对话框服务实例
func NewDialogService(logger *log.Service) *DialogService {
func NewDialogService(logger *log.LogService) *DialogService {
if logger == nil {
logger = log.New()
}

4
internal/services/document_service.go
View File

@@ -79,13 +79,13 @@ WHERE id = ?`
// DocumentService provides document management functionality
type DocumentService struct {
databaseService *DatabaseService
logger *log.Service
logger *log.LogService
mu sync.RWMutex
ctx context.Context
}
// NewDocumentService creates a new document service
func NewDocumentService(databaseService *DatabaseService, logger *log.Service) *DocumentService {
func NewDocumentService(databaseService *DatabaseService, logger *log.LogService) *DocumentService {
if logger == nil {
logger = log.New()
}

4
internal/services/extension_service.go
View File

@@ -41,7 +41,7 @@ WHERE id = ?`
// ExtensionService 扩展管理服务
type ExtensionService struct {
databaseService *DatabaseService
logger *log.Service
logger *log.LogService
mu sync.RWMutex
ctx context.Context
@@ -73,7 +73,7 @@ func (e *ExtensionError) Is(target error) bool {
}
// NewExtensionService 创建扩展服务实例
func NewExtensionService(databaseService *DatabaseService, logger *log.Service) *ExtensionService {
func NewExtensionService(databaseService *DatabaseService, logger *log.LogService) *ExtensionService {
if logger == nil {
logger = log.New()
}

4
internal/services/hotkey_service.go
View File

@@ -24,7 +24,7 @@ import (
// HotkeyService Windows全局热键服务
type HotkeyService struct {
logger *log.Service
logger *log.LogService
configService *ConfigService
app *application.App
@@ -52,7 +52,7 @@ func (e *HotkeyError) Unwrap() error {
}
// NewHotkeyService 创建热键服务实例
func NewHotkeyService(configService *ConfigService, logger *log.Service) *HotkeyService {
func NewHotkeyService(configService *ConfigService, logger *log.LogService) *HotkeyService {
if logger == nil {
logger = log.New()
}

4
internal/services/hotkey_service_darwin.go
View File

@@ -80,7 +80,7 @@ var globalHotkeyService *HotkeyService
// HotkeyService macOS全局热键服务
type HotkeyService struct {
logger *log.Service
logger *log.LogService
configService *ConfigService
app *application.App
mu sync.RWMutex
@@ -105,7 +105,7 @@ func (e *HotkeyError) Unwrap() error {
}
// NewHotkeyService 创建新的热键服务实例
func NewHotkeyService(configService *ConfigService, logger *log.Service) *HotkeyService {
func NewHotkeyService(configService *ConfigService, logger *log.LogService) *HotkeyService {
if logger == nil {
logger = log.New()
}

4
internal/services/hotkey_service_linux.go
View File

@@ -141,7 +141,7 @@ import (
// HotkeyService Linux全局热键服务
type HotkeyService struct {
logger *log.Service
logger *log.LogService
configService *ConfigService
app *application.App
@@ -170,7 +170,7 @@ func (e *HotkeyError) Unwrap() error {
}
// NewHotkeyService 创建热键服务实例
func NewHotkeyService(configService *ConfigService, logger *log.Service) *HotkeyService {
func NewHotkeyService(configService *ConfigService, logger *log.LogService) *HotkeyService {
if logger == nil {
logger = log.New()
}

4
internal/services/keybinding_service.go
View File

@@ -51,7 +51,7 @@ const (
// KeyBindingService 快捷键管理服务
type KeyBindingService struct {
databaseService *DatabaseService
logger *log.Service
logger *log.LogService
mu sync.RWMutex
ctx context.Context
@@ -83,7 +83,7 @@ func (e *KeyBindingError) Is(target error) bool {
}
// NewKeyBindingService 创建快捷键服务实例
func NewKeyBindingService(databaseService *DatabaseService, logger *log.Service) *KeyBindingService {
func NewKeyBindingService(databaseService *DatabaseService, logger *log.LogService) *KeyBindingService {
if logger == nil {
logger = log.New()
}

4
internal/services/path_migration_service.go
View File

@@ -33,7 +33,7 @@ type MigrationProgress struct {
// MigrationService 迁移服务
type MigrationService struct {
logger *log.Service
logger *log.LogService
mu sync.RWMutex
progress atomic.Value // stores MigrationProgress
@@ -42,7 +42,7 @@ type MigrationService struct {
}
// NewMigrationService 创建迁移服务
func NewMigrationService(logger *log.Service) *MigrationService {
func NewMigrationService(logger *log.LogService) *MigrationService {
if logger == nil {
logger = log.New()
}

4
internal/services/self_update_service.go
View File

@@ -26,7 +26,7 @@ type SelfUpdateResult struct {
// SelfUpdateService 自我更新服务
type SelfUpdateService struct {
logger *log.Service
logger *log.LogService
configService *ConfigService
config *models.AppConfig
@@ -35,7 +35,7 @@ type SelfUpdateService struct {
}
// NewSelfUpdateService 创建自我更新服务实例
func NewSelfUpdateService(configService *ConfigService, logger *log.Service) (*SelfUpdateService, error) {
func NewSelfUpdateService(configService *ConfigService, logger *log.LogService) (*SelfUpdateService, error) {
// 获取配置
appConfig, err := configService.GetConfig()
if err != nil {

4
internal/services/service_manager.go
View File

@@ -24,7 +24,7 @@ type ServiceManager struct {
selfUpdateService *SelfUpdateService
translationService *TranslationService
BackupService *BackupService
logger *log.Service
logger *log.LogService
}
// NewServiceManager 创建新的服务管理器实例
@@ -157,7 +157,7 @@ func (sm *ServiceManager) GetDialogService() *DialogService {
}
// GetLogger 获取日志服务实例
func (sm *ServiceManager) GetLogger() *log.Service {
func (sm *ServiceManager) GetLogger() *log.LogService {
return sm.logger
}

4
internal/services/startup_darwin.go
View File

@@ -15,14 +15,14 @@ import (
// DarwinStartupImpl macOS 平台开机启动实现
type DarwinStartupImpl struct {
logger *log.Service
logger *log.LogService
disabled bool
appPath string
appName string
}
// newStartupImplementation 创建平台特定的开机启动实现
func newStartupImplementation(logger *log.Service) StartupImplementation {
func newStartupImplementation(logger *log.LogService) StartupImplementation {
return &DarwinStartupImpl{
logger: logger,
}

4
internal/services/startup_linux.go
View File

@@ -13,7 +13,7 @@ import (
// LinuxStartupImpl Linux 平台开机启动实现
type LinuxStartupImpl struct {
logger *log.Service
logger *log.LogService
autostartDir string
execPath string
appName string
@@ -37,7 +37,7 @@ X-GNOME-Autostart-enabled=true
`
// newStartupImplementation 创建平台特定的开机启动实现
func newStartupImplementation(logger *log.Service) StartupImplementation {
func newStartupImplementation(logger *log.LogService) StartupImplementation {
return &LinuxStartupImpl{
logger: logger,
}

4
internal/services/startup_service.go
View File

@@ -7,7 +7,7 @@ import (
// StartupService 开机启动服务
type StartupService struct {
configService *ConfigService
logger *log.Service
logger *log.LogService
impl StartupImplementation
initError error
}
@@ -19,7 +19,7 @@ type StartupImplementation interface {
}
// NewStartupService 创建开机启动服务实例
func NewStartupService(configService *ConfigService, logger *log.Service) *StartupService {
func NewStartupService(configService *ConfigService, logger *log.LogService) *StartupService {
service := &StartupService{
configService: configService,
logger: logger,

4
internal/services/startup_windows.go
View File

@@ -15,7 +15,7 @@ import (
// WindowsStartupImpl Windows 平台开机启动实现
type WindowsStartupImpl struct {
logger *log.Service
logger *log.LogService
registryKey string
execPath string
workingDir string
@@ -23,7 +23,7 @@ type WindowsStartupImpl struct {
}
// newStartupImplementation 创建平台特定的开机启动实现
func newStartupImplementation(logger *log.Service) StartupImplementation {
func newStartupImplementation(logger *log.LogService) StartupImplementation {
return &WindowsStartupImpl{
logger: logger,
}

4
internal/services/store_service.go
View File

@@ -15,7 +15,7 @@ import (
type StoreOption struct {
FilePath string
AutoSave bool
Logger *log.Service
Logger *log.LogService
}
// Store 泛型存储服务
@@ -25,7 +25,7 @@ type Store[T any] struct {
dataMap sync.Map // thread-safe map
unsaved atomic.Bool
initOnce sync.Once
logger *log.Service
logger *log.LogService
}
// NewStore 存储服务

4
internal/services/system_service.go
View File

@@ -9,7 +9,7 @@ import (
// SystemService 系统监控服务
type SystemService struct {
logger *log.Service
logger *log.LogService
}
// MemoryStats 内存统计信息
@@ -29,7 +29,7 @@ type MemoryStats struct {
}
// NewSystemService 创建新的系统服务实例
func NewSystemService(logger *log.Service) *SystemService {
func NewSystemService(logger *log.LogService) *SystemService {
return &SystemService{
logger: logger,
}

4
internal/services/translation_service.go
View File

@@ -10,7 +10,7 @@ import (
// TranslationService 翻译服务
type TranslationService struct {
logger *log.Service
logger *log.LogService
factory *translator.TranslatorFactory
defaultTimeout time.Duration
translators map[translator.TranslatorType]translator.Translator
@@ -18,7 +18,7 @@ type TranslationService struct {
}
// NewTranslationService 创建翻译服务实例
func NewTranslationService(logger *log.Service) *TranslationService {
func NewTranslationService(logger *log.LogService) *TranslationService {
service := &TranslationService{
logger: logger,
factory: translator.NewTranslatorFactory(),

9
internal/services/tray_service.go
View File

@@ -7,14 +7,14 @@ import (
// TrayService 系统托盘服务
type TrayService struct {
logger *log.Service
logger *log.LogService
configService *ConfigService
app *application.App
mainWindow *application.WebviewWindow
}
// NewTrayService 创建新的系统托盘服务实例
func NewTrayService(logger *log.Service, configService *ConfigService) *TrayService {
func NewTrayService(logger *log.LogService, configService *ConfigService) *TrayService {
return &TrayService{
logger: logger,
configService: configService,
@@ -42,7 +42,6 @@ func (ts *TrayService) HandleWindowClose() {
if ts.ShouldMinimizeToTray() {
// 隐藏到托盘
ts.mainWindow.Hide()
ts.app.Event.Emit("window:hidden", nil)
} else {
// 直接退出应用
ts.app.Quit()
@@ -54,7 +53,6 @@ func (ts *TrayService) HandleWindowMinimize() {
if ts.ShouldMinimizeToTray() {
// 隐藏到托盘
ts.mainWindow.Hide()
ts.app.Event.Emit("window:hidden", nil)
}
}
@@ -64,9 +62,6 @@ func (ts *TrayService) ShowWindow() {
ts.mainWindow.Show()
ts.mainWindow.Restore()
ts.mainWindow.Focus()
if ts.app != nil {
ts.app.Event.Emit("window:shown", nil)
}
}
}

4
internal/services/window_service.go
View File

@@ -18,7 +18,7 @@ type WindowInfo struct {
// WindowService 窗口管理服务
type WindowService struct {
logger *log.Service
logger *log.LogService
documentService *DocumentService
app *application.App
mainWindow *application.WebviewWindow
@@ -27,7 +27,7 @@ type WindowService struct {
}
// NewWindowService 创建新的窗口服务实例
func NewWindowService(logger *log.Service, documentService *DocumentService) *WindowService {
func NewWindowService(logger *log.LogService, documentService *DocumentService) *WindowService {
if logger == nil {
logger = log.New()
}