Browse Source

adding round corners to dragNdrop area

Armin Schrenk 5 years ago
parent
commit
ae97e42d11

+ 1 - 1
main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java

@@ -1,6 +1,7 @@
 package org.cryptomator.ui.mainwindow;
 package org.cryptomator.ui.mainwindow;
 
 
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.binding.BooleanBinding;
+import javafx.beans.binding.IntegerBinding;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXML;
 import javafx.scene.input.TransferMode;
 import javafx.scene.input.TransferMode;
@@ -97,7 +98,6 @@ public class MainWindowController implements FxController {
 			}
 			}
 			event.consume();
 			event.consume();
 		});
 		});
-
 	}
 	}
 
 
 	private void addVault(final File dropped) {
 	private void addVault(final File dropped) {

+ 4 - 3
main/ui/src/main/resources/fxml/main_window.fxml

@@ -9,8 +9,8 @@
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.shape.Rectangle?>
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <VBox xmlns="http://javafx.com/javafx"
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:id="dragAndDropRegion"
 	  fx:id="dragAndDropRegion"
@@ -50,11 +50,12 @@
 			<fx:include source="/fxml/vault_detail.fxml" SplitPane.resizableWithParent="true"/>
 			<fx:include source="/fxml/vault_detail.fxml" SplitPane.resizableWithParent="true"/>
 		</SplitPane>
 		</SplitPane>
 		<Region styleClass="resizer" StackPane.alignment="BOTTOM_RIGHT" fx:id="resizer" prefWidth="10" prefHeight="10" maxWidth="-Infinity" maxHeight="-Infinity"/>
 		<Region styleClass="resizer" StackPane.alignment="BOTTOM_RIGHT" fx:id="resizer" prefWidth="10" prefHeight="10" maxWidth="-Infinity" maxHeight="-Infinity"/>
-		<VBox fx:id="dragNDropIndicator" >
+		<VBox fx:id="dragNDropIndicator">
 			<padding>
 			<padding>
 				<Insets topRightBottomLeft="20"/>
 				<Insets topRightBottomLeft="20"/>
 			</padding>
 			</padding>
-			<Rectangle fill="red" stroke="black" height="200" width="200" />
+			<Rectangle arcHeight="4" arcWidth="4" fill="gainsboro" strokeType="CENTERED" strokeWidth="3" strokeDashArray="20, 20" strokeLineJoin="ROUND" stroke="black" height="${dragAndDropRegion.height - 90}"
+					   width="${dragAndDropRegion.width - 40}"/>
 		</VBox>
 		</VBox>
 	</StackPane>
 	</StackPane>
 </VBox>
 </VBox>