For Win 11

srilakshmikanthanp · Nov 3, 2021 · 8583882 · 8583882
1 parent 2422c00
commit 8583882
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/assets/images/demo.png b/assets/images/demo.png
diff --git a/src/main/java/com/github/srilakshmikanthanp/quicknote/Editor/Editor.java b/src/main/java/com/github/srilakshmikanthanp/quicknote/Editor/Editor.java
@@ -158,6 +158,7 @@ public Editor() {
         this.setMaxWidth(Prefs.MAX_WIDTH);
         this.setMaxHeight(Prefs.MAX_HEIGHT);
         this.setAlwaysOnTop(true);
+
         Helper.setTheme(scene);
 
         new Resizer(this, 10, 5);
@@ -175,19 +176,20 @@ public void showOnPosition(double x, double y) {
         var rect2D = Screen.getPrimary().getVisualBounds();
         var scaleX = Screen.getPrimary().getOutputScaleX();
         var scaleY = Screen.getPrimary().getOutputScaleY();
+        var margin = 15;
         var pCalcX = x / scaleX - (this.getWidth() / 2);
         var pCalcY = y / scaleY - (this.getHeight() / 2);
 
         if (pCalcX < rect2D.getMinX()) {
-            pCalcX = rect2D.getMinX();
+            pCalcX = rect2D.getMinX() + margin;
         } else if (pCalcX + this.getWidth() > rect2D.getMaxX()) {
-            pCalcX = rect2D.getMaxX() - this.getWidth();
+            pCalcX = rect2D.getMaxX() - this.getWidth() - margin;
         }
 
         if (pCalcY < rect2D.getMinY()) {
-            pCalcY = rect2D.getMinY();
+            pCalcY = rect2D.getMinY() + margin;
         } else if (pCalcY + this.getHeight() > rect2D.getMaxY()) {
-            pCalcY = rect2D.getMaxY() - this.getHeight();
+            pCalcY = rect2D.getMaxY() - this.getHeight() - margin;
         }
 
         this.show();

diff --git a/src/main/resources/quicknote.properties b/src/main/resources/quicknote.properties
@@ -1,2 +1,2 @@
 version=${project.version}
-artifactId=${project.artifactId}
+artifactId=${project.artifactId}
diff --git a/src/main/resources/styles/Dark.css b/src/main/resources/styles/Dark.css
@@ -88,6 +88,7 @@
  */
 #qnote-editor {
   -fx-background-radius: 10;
+  -fx-background-color: #1f1e1e;
 }
 
 #qnote-editor .text-area {

diff --git a/src/main/resources/styles/Light.css b/src/main/resources/styles/Light.css
@@ -81,6 +81,7 @@
 */
 #qnote-editor {
   -fx-background-radius: 10;
+  -fx-background-color: #ebd5d5;
 }
 
 #qnote-editor .text-area {
@@ -89,4 +90,7 @@
   -fx-border-color: transparent;
   -fx-focus-color: transparent;
   -fx-faint-focus-color: transparent;
+  -fx-control-inner-background: #EEEEEE;
+  -fx-prompt-text-fill: gray;
+  -fx-text-fill: black;
 }