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

Small fixes

Browse source
This commit is contained in:
crschnick 2024-07-14 08:19:00 +00:00
parent 972f106cb0
commit 21b7e063aa
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,9 +32,9 @@ public class BrowserStatusBarComp extends SimpleComp {
@Override @Override
protected Region createSimple() { protected Region createSimple() {
var bar = new HorizontalComp(List.of( var bar = new HorizontalComp(List.of(
createProgressEstimateStatus(),
createProgressNameStatus(), createProgressNameStatus(),
createProgressStatus(), createProgressStatus(),
createProgressEstimateStatus(),
Comp.hspacer(), Comp.hspacer(),
createClipboardStatus(), createClipboardStatus(),
createSelectionStatus() createSelectionStatus()

5
app/src/main/java/io/xpipe/app/comp/store/StoreCategoryWrapper.java
View file

@ -112,6 +112,11 @@ public class StoreCategoryWrapper {
} }
public void update() { public void update() {
// We are probably in shutdown then
if (StoreViewState.get() == null) {
return;
}
// Avoid reupdating name when changed from the name property! // Avoid reupdating name when changed from the name property!
var catName = translatedName(category.getName()); var catName = translatedName(category.getName());
if (!catName.equals(name.getValue())) { if (!catName.equals(name.getValue())) {

2
app/src/main/java/io/xpipe/app/fxcomps/impl/FilterComp.java
View file

@ -39,7 +39,7 @@ public class FilterComp extends Comp<CompStructure<CustomTextField>> {
filter.getStyleClass().add("filter-comp"); filter.getStyleClass().add("filter-comp");
filter.promptTextProperty().bind(AppI18n.observable("searchFilter")); filter.promptTextProperty().bind(AppI18n.observable("searchFilter"));
filter.rightProperty().bind(Bindings.createObjectBinding(() -> { filter.rightProperty().bind(Bindings.createObjectBinding(() -> {
return filter.isFocused() ? clear : fi; return filter.isFocused() || (filter.getText() != null && !filter.getText().isEmpty()) ? clear : fi;
}, filter.focusedProperty())); }, filter.focusedProperty()));
filter.setAccessibleText("Filter"); filter.setAccessibleText("Filter");

6
app/src/main/java/io/xpipe/app/prefs/VaultCategory.java
View file

@ -36,8 +36,6 @@ public class VaultCategory extends AppPrefsCategory {
} }
builder.addTitle("vaultSecurity") builder.addTitle("vaultSecurity")
.sub(new OptionsBuilder() .sub(new OptionsBuilder()
.nameAndDescription("encryptAllVaultData")
.addToggle(prefs.encryptAllVaultData)
.nameAndDescription("workspaceLock") .nameAndDescription("workspaceLock")
.addComp( .addComp(
new ButtonComp( new ButtonComp(
@ -57,7 +55,9 @@ public class VaultCategory extends AppPrefsCategory {
.addToggle(prefs.lockVaultOnHibernation) .addToggle(prefs.lockVaultOnHibernation)
.hide(prefs.getLockCrypt() .hide(prefs.getLockCrypt()
.isNull() .isNull()
.or(prefs.getLockCrypt().isEmpty()))); .or(prefs.getLockCrypt().isEmpty()))
.nameAndDescription("encryptAllVaultData")
.addToggle(prefs.encryptAllVaultData));
return builder.buildComp(); return builder.buildComp();
} }
} }