Merge branch 'feature/redesign-mainwindow' into feature/condensed-vault-list

src/main/java/org/cryptomator/ui/mainwindow/MainWindowSceneFactory.java

@@ -30,9 +30,7 @@ public class MainWindowSceneFactory extends DefaultSceneFactory {
 
 	@Override
 	protected void setupDefaultAccelerators(Scene scene, Stage stage) {
-		if (SystemUtils.IS_OS_WINDOWS) {
-			scene.getAccelerators().put(ALT_F4, window::close);
-		} else {
+		if (!SystemUtils.IS_OS_WINDOWS) {
 			scene.getAccelerators().put(SHORTCUT_W, window::close);
 		}
 		scene.getAccelerators().put(SHORTCUT_N, vaultListController.get()::didClickAddNewVault);

src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java

@@ -36,7 +36,6 @@ import javafx.scene.input.MouseEvent;
 import javafx.scene.input.TransferMode;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 import java.io.File;
 import java.io.IOException;
@@ -75,9 +74,9 @@ public class VaultListController implements FxController {
 	private final BooleanBinding useCondensedMode;
 
 	public ListView<Vault> vaultList;
-	public VBox vbox;
 	public StackPane root;
-	public HBox addVaultButton;
+	@FXML
+	private HBox addVaultButton;
 	@FXML
 	private ContextMenu addVaultContextMenu;
 

src/main/resources/css/light_theme.css

@@ -177,8 +177,8 @@
 
 /* windows needs an explicit border: */
 .main-window.os-windows {
-	-fx-border-color: TITLE_BG;
-	-fx-border-width: 1px;
+	-fx-border-color: CONTROL_BORDER_NORMAL;
+	-fx-border-width: 1px 0 0 0;
 }
 
 .main-window .button-bar {

src/main/resources/fxml/main_window.fxml

@@ -8,7 +8,7 @@
 		   fx:id="root"
 		   fx:controller="org.cryptomator.ui.mainwindow.MainWindowController"
 		   styleClass="main-window">
-	<VBox minWidth="650">
+	<VBox minWidth="600">
 		<SplitPane dividerPositions="0.33" orientation="HORIZONTAL" VBox.vgrow="ALWAYS">
 			<fx:include source="vault_list.fxml" SplitPane.resizableWithParent="false"/>
 			<fx:include source="vault_detail.fxml" SplitPane.resizableWithParent="true"/>

src/main/resources/fxml/vault_list.fxml

@@ -32,22 +32,18 @@
 			</VBox>
 		</StackPane>
 		<HBox styleClass="button-bar">
-			<HBox fx:id="addVaultButton" spacing="12" onMouseClicked="#toggleMenu" styleClass="button-left">
+			<HBox fx:id="addVaultButton" onMouseClicked="#toggleMenu" styleClass="button-left" alignment="CENTER" minWidth="20">
 				<padding>
 					<Insets topRightBottomLeft="12"/>
 				</padding>
-				<VBox alignment="CENTER" minWidth="20">
-					<FontAwesome5IconView glyph="PLUS" HBox.hgrow="NEVER" glyphSize="16"/>
-				</VBox>
+				<FontAwesome5IconView glyph="PLUS" HBox.hgrow="NEVER" glyphSize="16"/>
 			</HBox>
 			<Region HBox.hgrow="ALWAYS"/>
-			<HBox spacing="12" onMouseClicked="#showPreferences" styleClass="button-right">
+			<HBox onMouseClicked="#showPreferences" styleClass="button-right" alignment="CENTER" minWidth="20">
 				<padding>
 					<Insets topRightBottomLeft="12"/>
 				</padding>
-				<VBox alignment="CENTER" minWidth="20">
-					<FontAwesome5IconView glyph="COG" HBox.hgrow="NEVER" glyphSize="16"/>
-				</VBox>
+				<FontAwesome5IconView glyph="COG" HBox.hgrow="NEVER" glyphSize="16"/>
 			</HBox>
 		</HBox>
 	</VBox>