octopus_yan/alist-gui
1
0
Fork 0
mirror of https://github.com/octopusYan/alist-gui.git synced 2024-11-23 20:46:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: 修改类名 WindowsUtil -> ViewUtil

Browse Source
This commit is contained in:
octopus_yan 2024-09-21 19:36:21 +08:00
parent fbdf6b3ba7
commit 6294fdbf42
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/cn/octopusyan/alistgui/base/BaseController.java
View File

@ -4,7 +4,7 @@ import cn.octopusyan.alistgui.Application;
import cn.octopusyan.alistgui.config.Context; import cn.octopusyan.alistgui.config.Context;
import cn.octopusyan.alistgui.config.I18n; import cn.octopusyan.alistgui.config.I18n;
import cn.octopusyan.alistgui.util.FxmlUtil; import cn.octopusyan.alistgui.util.FxmlUtil;
import cn.octopusyan.alistgui.util.WindowsUtil; import cn.octopusyan.alistgui.util.ViewUtil;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.fxml.Initializable; import javafx.fxml.Initializable;
import javafx.scene.control.Labeled; import javafx.scene.control.Labeled;
@ -83,7 +83,7 @@ public abstract class BaseController<VM extends BaseViewModel> implements Initia
// 全局窗口拖拽 // 全局窗口拖拽
if (dragWindow() && getRootPanel() != null) { if (dragWindow() && getRootPanel() != null) {
// 窗口拖拽 // 窗口拖拽
WindowsUtil.bindDragged(getRootPanel()); ViewUtil.bindDragged(getRootPanel());
} }
// 国际化绑定 // 国际化绑定

4
src/main/java/cn/octopusyan/alistgui/controller/RootController.java
View File

@ -6,7 +6,7 @@ import cn.octopusyan.alistgui.config.Context;
import cn.octopusyan.alistgui.config.I18n; import cn.octopusyan.alistgui.config.I18n;
import cn.octopusyan.alistgui.manager.ConfigManager; import cn.octopusyan.alistgui.manager.ConfigManager;
import cn.octopusyan.alistgui.manager.SystemTrayManager; import cn.octopusyan.alistgui.manager.SystemTrayManager;
import cn.octopusyan.alistgui.util.WindowsUtil; import cn.octopusyan.alistgui.util.ViewUtil;
import cn.octopusyan.alistgui.viewModel.RootViewModel; import cn.octopusyan.alistgui.viewModel.RootViewModel;
import com.gluonhq.emoji.EmojiData; import com.gluonhq.emoji.EmojiData;
import com.gluonhq.emoji.util.EmojiImageUtils; import com.gluonhq.emoji.util.EmojiImageUtils;
@ -129,7 +129,7 @@ public class RootController extends BaseController<RootViewModel> {
getWindow().setAlwaysOnTop(newVal); getWindow().setAlwaysOnTop(newVal);
}); });
WindowsUtil.bindDragged(windowHeader); ViewUtil.bindDragged(windowHeader);
viewModel.currentViewIndexProperty().bind(tabPane.getSelectionModel().selectedIndexProperty()); viewModel.currentViewIndexProperty().bind(tabPane.getSelectionModel().selectedIndexProperty());
} }

8
src/main/java/cn/octopusyan/alistgui/manager/SystemTrayManager.java
View File

@ -3,7 +3,7 @@ package cn.octopusyan.alistgui.manager;
import cn.octopusyan.alistgui.Application; import cn.octopusyan.alistgui.Application;
import cn.octopusyan.alistgui.config.Constants; import cn.octopusyan.alistgui.config.Constants;
import cn.octopusyan.alistgui.config.Context; import cn.octopusyan.alistgui.config.Context;
import cn.octopusyan.alistgui.util.WindowsUtil; import cn.octopusyan.alistgui.util.ViewUtil;
import cn.octopusyan.alistgui.view.PopupMenu; import cn.octopusyan.alistgui.view.PopupMenu;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.beans.binding.StringBinding; import javafx.beans.binding.StringBinding;
@ -48,7 +48,7 @@ public class SystemTrayManager {
public static void icon(String path) { public static void icon(String path) {
if (trayIcon == null) return; if (trayIcon == null) return;
icon(WindowsUtil.class.getResource(path)); icon(ViewUtil.class.getResource(path));
} }
public static void icon(URL url) { public static void icon(URL url) {
@ -100,7 +100,7 @@ public class SystemTrayManager {
if (trayIcon != null) return; if (trayIcon != null) return;
// 系统托盘图标 // 系统托盘图标
URL resource = WindowsUtil.class.getResource(STR."/assets/logo\{running ? "" : "-disabled"}.png"); URL resource = ViewUtil.class.getResource(STR."/assets/logo\{running ? "" : "-disabled"}.png");
Image image = Toolkit.getDefaultToolkit().getImage(resource); Image image = Toolkit.getDefaultToolkit().getImage(resource);
trayIcon = new TrayIcon(image); trayIcon = new TrayIcon(image);
@ -187,6 +187,6 @@ public class SystemTrayManager {
} }
private static Stage stage() { private static Stage stage() {
return WindowsUtil.getStage(); return ViewUtil.getStage();
} }
} }

2
src/main/java/cn/octopusyan/alistgui/util/WindowsUtil.java → src/main/java/cn/octopusyan/alistgui/util/ViewUtil.java
View File

@ -13,7 +13,7 @@ import java.util.Map;
* *
* @author octopus_yan * @author octopus_yan
*/ */
public class WindowsUtil { public class ViewUtil {
// 获取系统缩放比 // 获取系统缩放比
public static final double scaleX = Screen.getPrimary().getOutputScaleX(); public static final double scaleX = Screen.getPrimary().getOutputScaleX();
public static final double scaleY = Screen.getPrimary().getOutputScaleY(); public static final double scaleY = Screen.getPrimary().getOutputScaleY();

6
src/main/java/cn/octopusyan/alistgui/view/PopupMenu.java
View File

@ -2,7 +2,7 @@ package cn.octopusyan.alistgui.view;
import atlantafx.base.controls.CaptionMenuItem; import atlantafx.base.controls.CaptionMenuItem;
import cn.octopusyan.alistgui.config.Constants; import cn.octopusyan.alistgui.config.Constants;
import cn.octopusyan.alistgui.util.WindowsUtil; import cn.octopusyan.alistgui.util.ViewUtil;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.beans.binding.StringBinding; import javafx.beans.binding.StringBinding;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
@ -115,8 +115,8 @@ public class PopupMenu {
root.hide(); root.hide();
root.show(utilityStage, root.show(utilityStage,
event.getX() / WindowsUtil.scaleX, event.getX() / ViewUtil.scaleX,
event.getY() / WindowsUtil.scaleY event.getY() / ViewUtil.scaleY
); );
// 获取焦点 (失去焦点隐藏自身) // 获取焦点 (失去焦点隐藏自身)
root.requestFocus(); root.requestFocus();

8
src/main/java/cn/octopusyan/alistgui/view/alert/builder/DefaultBuilder.java
View File

@ -2,7 +2,7 @@ package cn.octopusyan.alistgui.view.alert.builder;
import cn.octopusyan.alistgui.base.BaseBuilder; import cn.octopusyan.alistgui.base.BaseBuilder;
import cn.octopusyan.alistgui.config.Context; import cn.octopusyan.alistgui.config.Context;
import cn.octopusyan.alistgui.util.WindowsUtil; import cn.octopusyan.alistgui.util.ViewUtil;
import javafx.scene.Node; import javafx.scene.Node;
import javafx.scene.control.ButtonBar; import javafx.scene.control.ButtonBar;
import javafx.scene.control.ButtonType; import javafx.scene.control.ButtonType;
@ -26,9 +26,9 @@ public class DefaultBuilder extends BaseBuilder<DefaultBuilder, Dialog<?>> {
DialogPane dialogPane = dialog.getDialogPane(); DialogPane dialogPane = dialog.getDialogPane();
dialogPane.getScene().setFill(Color.TRANSPARENT); dialogPane.getScene().setFill(Color.TRANSPARENT);
WindowsUtil.bindDragged(dialogPane); ViewUtil.bindDragged(dialogPane);
WindowsUtil.bindShadow(dialogPane); ViewUtil.bindShadow(dialogPane);
WindowsUtil.getStage(dialogPane).initStyle(StageStyle.TRANSPARENT); ViewUtil.getStage(dialogPane).initStyle(StageStyle.TRANSPARENT);
dialogPane.getButtonTypes().add(new ButtonType( dialogPane.getButtonTypes().add(new ButtonType(
Context.getLanguageBinding("label.cancel").get(), Context.getLanguageBinding("label.cancel").get(),