Merge branch 'develop' into release/1.6.16

This commit is contained in:
Armin Schrenk
2022-12-06 15:44:18 +01:00
2 changed files with 5 additions and 1 deletions

View File

@@ -27,7 +27,7 @@
<nonModularGroupIds>com.github.serceman,com.github.jnr,org.ow2.asm,net.java.dev.jna,org.apache.jackrabbit,org.apache.httpcomponents,de.swiesend,org.purejava,com.github.hypfvieh</nonModularGroupIds>
<!-- cryptomator dependencies -->
<cryptomator.cryptofs.version>2.5.2</cryptomator.cryptofs.version>
<cryptomator.cryptofs.version>2.5.3</cryptomator.cryptofs.version>
<cryptomator.integrations.version>1.2.0-beta1</cryptomator.integrations.version>
<cryptomator.integrations.win.version>1.1.2</cryptomator.integrations.win.version>
<cryptomator.integrations.mac.version>1.1.2</cryptomator.integrations.mac.version>

View File

@@ -182,6 +182,10 @@ public class ResultListCellController implements FxController {
return fixGlyph;
}
public FontAwesome5Icon getFixGlyph() {
return fixGlyph.getValue();
}
public BooleanBinding fixableProperty() {
return fixable;
}