beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-21 23:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Various fixes

Browse source
This commit is contained in:
crschnick 2024-07-21 02:19:19 +00:00
parent 031ff66387
commit fbf307d0bd
5 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/io/xpipe/app/browser/BrowserBookmarkComp.java
View file

@ -45,7 +45,7 @@ public final class BrowserBookmarkComp extends SimpleComp {
BiConsumer<StoreSection, Comp<CompStructure<Button>>> augment = (s, comp) -> { BiConsumer<StoreSection, Comp<CompStructure<Button>>> augment = (s, comp) -> {
comp.disable(Bindings.createBooleanBinding( comp.disable(Bindings.createBooleanBinding(
() -> { () -> {
return busy.get() || !applicable.test(s.getWrapper()); return !applicable.test(s.getWrapper());
}, },
busy)); busy));
comp.apply(struc -> { comp.apply(struc -> {

4
app/src/main/java/io/xpipe/app/browser/session/BrowserSessionTabsComp.java
View file

@ -255,6 +255,10 @@ public class BrowserSessionTabsComp extends SimpleComp {
var keyCode = Arrays.stream(KeyCode.values()).filter(code -> code.getCode() == start + index).findAny().orElse(null); var keyCode = Arrays.stream(KeyCode.values()).filter(code -> code.getCode() == start + index).findAny().orElse(null);
return keyCode != null ? new KeyCodeCombination(keyCode) : null; return keyCode != null ? new KeyCodeCombination(keyCode) : null;
}, tabs.getTabs())); }, tabs.getTabs()));
select.setOnAction(event -> {
tabs.getSelectionModel().select(tab);
event.consume();
});
cm.getItems().add(select); cm.getItems().add(select);
cm.getItems().add(new SeparatorMenuItem()); cm.getItems().add(new SeparatorMenuItem());

6
app/src/main/resources/io/xpipe/app/resources/style/browser.css
View file

@ -63,10 +63,6 @@
-fx-background-color: -color-neutral-muted; -fx-background-color: -color-neutral-muted;
} }
.browser .welcome .loading-comp {
-fx-background-color: transparent;
}
.browser .tile > * { .browser .tile > * {
-fx-padding: 0.6em 0 0.6em 0; -fx-padding: 0.6em 0 0.6em 0;
} }
@ -212,7 +208,7 @@
-fx-opacity: 0; -fx-opacity: 0;
} }
.browser .tab-loading-indicator { .browser .tab-loading-indicator .loading-comp {
-fx-min-width: 2.5em; -fx-min-width: 2.5em;
-fx-pref-width: 2.5em; -fx-pref-width: 2.5em;
-fx-max-width: 2.5em; -fx-max-width: 2.5em;

4
app/src/main/resources/io/xpipe/app/resources/style/prefs.css
View file

@ -46,7 +46,7 @@
} }
.prefs .sidebar .button:selected { .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 { .prefs .sidebar .button:armed {
@ -54,7 +54,7 @@
} }
.prefs .sidebar .button:hover, .root:key-navigation .prefs .sidebar .button:focused { .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 { .prefs .theme-switcher .combo-box-popup .list-view {

5
ext/base/src/main/java/module-info.java
View file

@ -12,6 +12,9 @@ import io.xpipe.ext.base.script.ScriptDataStorageProvider;
import io.xpipe.ext.base.script.ScriptGroupStoreProvider; import io.xpipe.ext.base.script.ScriptGroupStoreProvider;
import io.xpipe.ext.base.script.SimpleScriptStoreProvider; import io.xpipe.ext.base.script.SimpleScriptStoreProvider;
import io.xpipe.ext.base.service.*; 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 { open module io.xpipe.ext.base {
exports io.xpipe.ext.base; exports io.xpipe.ext.base;
@ -59,7 +62,7 @@ open module io.xpipe.ext.base {
UnzipAction, UnzipAction,
JavapAction, JavapAction,
JarAction; JarAction;
provides ActionProvider with provides ActionProvider with StoreStopAction, StoreStartAction, StorePauseAction,
ServiceOpenAction, ServiceOpenAction,
ServiceOpenHttpAction, ServiceOpenHttpAction,
ServiceOpenHttpsAction, ServiceOpenHttpsAction,