diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserBookmarkComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserBookmarkComp.java index 2a18d4643..9dab4f23c 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserBookmarkComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserBookmarkComp.java @@ -45,7 +45,7 @@ public final class BrowserBookmarkComp extends SimpleComp { BiConsumer>> augment = (s, comp) -> { comp.disable(Bindings.createBooleanBinding( () -> { - return busy.get() || !applicable.test(s.getWrapper()); + return !applicable.test(s.getWrapper()); }, busy)); comp.apply(struc -> { diff --git a/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionTabsComp.java b/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionTabsComp.java index dc034324f..c80ee3d8e 100644 --- a/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionTabsComp.java +++ b/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionTabsComp.java @@ -255,6 +255,10 @@ public class BrowserSessionTabsComp extends SimpleComp { var keyCode = Arrays.stream(KeyCode.values()).filter(code -> code.getCode() == start + index).findAny().orElse(null); return keyCode != null ? new KeyCodeCombination(keyCode) : null; }, tabs.getTabs())); + select.setOnAction(event -> { + tabs.getSelectionModel().select(tab); + event.consume(); + }); cm.getItems().add(select); cm.getItems().add(new SeparatorMenuItem()); diff --git a/app/src/main/resources/io/xpipe/app/resources/style/browser.css b/app/src/main/resources/io/xpipe/app/resources/style/browser.css index 860741ad9..5d44b1a71 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/browser.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/browser.css @@ -63,10 +63,6 @@ -fx-background-color: -color-neutral-muted; } -.browser .welcome .loading-comp { - -fx-background-color: transparent; -} - .browser .tile > * { -fx-padding: 0.6em 0 0.6em 0; } @@ -212,7 +208,7 @@ -fx-opacity: 0; } -.browser .tab-loading-indicator { +.browser .tab-loading-indicator .loading-comp { -fx-min-width: 2.5em; -fx-pref-width: 2.5em; -fx-max-width: 2.5em; diff --git a/app/src/main/resources/io/xpipe/app/resources/style/prefs.css b/app/src/main/resources/io/xpipe/app/resources/style/prefs.css index 9aa7e844b..f00863e4c 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/prefs.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/prefs.css @@ -46,7 +46,7 @@ } .prefs .sidebar .button:selected { - -fx-background-color: transparent, -color-accent-emphasis, -color-bg-default; + -fx-background-color: transparent, -color-border-default, -color-bg-default; } .prefs .sidebar .button:armed { @@ -54,7 +54,7 @@ } .prefs .sidebar .button:hover, .root:key-navigation .prefs .sidebar .button:focused { - -fx-background-color: transparent, -color-bg-overlay; + -fx-background-color: transparent, -color-border-default, -color-bg-overlay; } .prefs .theme-switcher .combo-box-popup .list-view { diff --git a/ext/base/src/main/java/module-info.java b/ext/base/src/main/java/module-info.java index fca233aac..65c104c2f 100644 --- a/ext/base/src/main/java/module-info.java +++ b/ext/base/src/main/java/module-info.java @@ -12,6 +12,9 @@ import io.xpipe.ext.base.script.ScriptDataStorageProvider; import io.xpipe.ext.base.script.ScriptGroupStoreProvider; import io.xpipe.ext.base.script.SimpleScriptStoreProvider; import io.xpipe.ext.base.service.*; +import io.xpipe.ext.base.store.StorePauseAction; +import io.xpipe.ext.base.store.StoreStartAction; +import io.xpipe.ext.base.store.StoreStopAction; open module io.xpipe.ext.base { exports io.xpipe.ext.base; @@ -59,7 +62,7 @@ open module io.xpipe.ext.base { UnzipAction, JavapAction, JarAction; - provides ActionProvider with + provides ActionProvider with StoreStopAction, StoreStartAction, StorePauseAction, ServiceOpenAction, ServiceOpenHttpAction, ServiceOpenHttpsAction,