aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyeyoung <cyoung06@naver.com>2023-01-21 00:33:40 +0900
committersyeyoung <cyoung06@naver.com>2023-01-21 00:33:40 +0900
commitc04cff32cdf5f53beb3a3cda6809208ba84ffa74 (patch)
tree1622cdb4f9cbca6b3f584fc4f31699c29c572930
parent4ef02cf84279ebc9ebe5e508fbac19f12247b219 (diff)
downloadSkyblock-Dungeons-Guide-c04cff32cdf5f53beb3a3cda6809208ba84ffa74.tar.gz
Skyblock-Dungeons-Guide-c04cff32cdf5f53beb3a3cda6809208ba84ffa74.tar.bz2
Skyblock-Dungeons-Guide-c04cff32cdf5f53beb3a3cda6809208ba84ffa74.zip
- macos had hidden cursors smh
Signed-off-by: syeyoung <cyoung06@naver.com>
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/location/PanelDelegate.java16
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/cursor/EnumCursor.java49
2 files changed, 45 insertions, 20 deletions
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/location/PanelDelegate.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/location/PanelDelegate.java
index 6b639749..bf61c1fb 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/location/PanelDelegate.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/location/PanelDelegate.java
@@ -380,23 +380,23 @@ public class PanelDelegate extends MPanel {
setCursor(EnumCursor.CLOSED_HAND);
} else if (selectedPart >= 0) {
if (internallyThinking.width < 0 && internallyThinking.height < 0) {
- setCursor(EnumCursor.RESIZE_TL);
+ setCursor(EnumCursor.RESIZE_TLDR);
} else if (internallyThinking.width < 0 && internallyThinking.height >= 0) {
- setCursor(EnumCursor.RESIZE_DL);
+ setCursor(EnumCursor.RESIZE_TRDL);
} else if (internallyThinking.width >= 0 && internallyThinking.height >= 0) {
- setCursor(EnumCursor.RESIZE_DR);
+ setCursor(EnumCursor.RESIZE_TLDR);
} else if (internallyThinking.width >= 0 && internallyThinking.height < 0) {
- setCursor(EnumCursor.RESIZE_TR);
+ setCursor(EnumCursor.RESIZE_TRDL);
}
} else if (lastAbsClip.contains(absMouseX, absMouseY)) {
if (relMouseX < 4 && relMouseY < 4) {
- setCursor(EnumCursor.RESIZE_TL);
+ setCursor(EnumCursor.RESIZE_TLDR);
} else if (relMouseX < 4 && relMouseY > getBounds().height - 4) {
- setCursor(EnumCursor.RESIZE_DL);
+ setCursor(EnumCursor.RESIZE_TRDL);
} else if (relMouseX > getBounds().width - 4 && relMouseY > getBounds().height - 4) {
- setCursor(EnumCursor.RESIZE_DR);
+ setCursor(EnumCursor.RESIZE_TLDR);
} else if (relMouseX > getBounds().width - 4 && relMouseY < 4) {
- setCursor(EnumCursor.RESIZE_TR);
+ setCursor(EnumCursor.RESIZE_TRDL);
} else {
setCursor(EnumCursor.OPEN_HAND);
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/cursor/EnumCursor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/cursor/EnumCursor.java
index e7762ba5..1144dd17 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/cursor/EnumCursor.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/cursor/EnumCursor.java
@@ -25,23 +25,48 @@ import lombok.Getter;
@AllArgsConstructor
@Getter
public enum EnumCursor {
+ /** there are these hidden cursors for macos
+ * [NSCursor _windowResizeEastCursor]
+ * [NSCursor _windowResizeWestCursor]
+ * [NSCursor _windowResizeEastWestCursor]
+ * [NSCursor _windowResizeNorthCursor]
+ * [NSCursor _windowResizeSouthCursor]
+ * [NSCursor _windowResizeNorthSouthCursor]
+ * [NSCursor _windowResizeNorthEastCursor]
+ * [NSCursor _windowResizeNorthWestCursor]
+ * [NSCursor _windowResizeSouthEastCursor]
+ * [NSCursor _windowResizeSouthWestCursor]
+ * [NSCursor _windowResizeNorthEastSouthWestCursor]
+ * [NSCursor _windowResizeNorthWestSouthEastCursor]
+ * https://stackoverflow.com/questions/10733228/native-osx-lion-resize-cursor-for-custom-nswindow-or-nsview
+ */
DEFAULT(32512,68,"arrowCursor","arrowCursor.cur"),
POINTING_HAND(32649,60,"pointingHandCursor", "pointingHandCursor.cur"),
OPEN_HAND(32646,58,"openHandCursor","openHandCursor.cur"),
CLOSED_HAND(32646,52,"closedHandCursor","closedHandCursor.cur"),
BEAM_CURSOR(32513, 152, "IBeamCursor", "IBeamCursor.cur"),
- RESIZE_LEFT(32644, 70,"resizeLeftCursor", "resizeLeftCursor.cur"),
- RESIZE_RIGHT(32644, 96,"resizeRightCursor", "resizeRightCursor.cur"),
- RESIZE_LEFT_RIGHT(32644, 108, "resizeLeftRightCursor", "resizeLeftRightCursor.cur"),
- RESIZE_UP(32645,138,"resizeUpCursor", "resizeUpCursor.cur"),
- RESIZE_DOWN(32645,16,"resizeDownCursor", "resizeDownCursor.cur"),
- RESIZE_UP_DOWN(32645,116,"resizeUpDownCursor", "resizeUpDownCursor.cur"),
- RESIZE_TL(32642, 134, null, "resizeNW.cur"),
- RESIZE_DR(32642, 14, null, "resizeSE.cur"),
- RESIZE_TLDR(32642, 14, null, "resizeNWSE.cur"),
- RESIZE_TR(32643, 136, null, "resizeNE.cur"),
- RESIZE_DL(32643, 12, null, "resizeSW.cur"),
- RESIZE_TRDL(32643, 12, null, "resizeNESW.cur"),
+
+ MOVE_BAR_LEFT(32644, 70,"resizeLeftCursor", "resizeLeftCursor.cur"),
+ MOVE_BAR_RIGHT(32644, 96,"resizeRightCursor", "resizeRightCursor.cur"),
+ MOVE_BAR_LEFT_RIGHT(32644, 108, "resizeLeftRightCursor", "resizeLeftRightCursor.cur"),
+ MOVE_BAR_UP(32645,138,"resizeUpCursor", "resizeUpCursor.cur"),
+ MOVE_BAR_DOWN(32645,16,"resizeDownCursor", "resizeDownCursor.cur"),
+ MOVE_BAR_UP_DOWN(32645,116,"resizeUpDownCursor", "resizeUpDownCursor.cur"),
+
+ RESIZE_LEFT(32644, 70,"_windowResizeWestCursor", "resizeLeftCursor.cur"),
+ RESIZE_RIGHT(32644, 96,"_windowResizeEastCursor", "resizeRightCursor.cur"),
+ RESIZE_LEFT_RIGHT(32644, 108, "_windowResizeEastWestCursor", "resizeLeftRightCursor.cur"),
+ RESIZE_UP(32645,138,"_windowResizeNorthCursor", "resizeUpCursor.cur"),
+ RESIZE_DOWN(32645,16,"_windowResizeSouthCursor", "resizeDownCursor.cur"),
+ RESIZE_UP_DOWN(32645,116,"_windowResizeNorthSouthCursor", "resizeUpDownCursor.cur"),
+
+
+ RESIZE_TL(32642, 134, "_windowResizeNorthWestCursor", "resizeNW.cur"),
+ RESIZE_DR(32642, 14, "_windowResizeSouthEastCursor", "resizeSE.cur"),
+ RESIZE_TLDR(32642, 14, "_windowResizeNorthWestSouthEastCursor", "resizeNWSE.cur"),
+ RESIZE_TR(32643, 136, "_windowResizeNorthEastCursor", "resizeNE.cur"),
+ RESIZE_DL(32643, 12, "_windowResizeSouthWestCursor", "resizeSW.cur"),
+ RESIZE_TRDL(32643, 12, "_windowResizeNorthEastSouthWestCursor", "resizeNESW.cur"),
CROSS(32515, 34,"crosshairCursor", "crosshairCursor.cur"),
NOT_ALLOWED(32648, -1,"operationNotAllowedCursor", "operationNotAllowedCursor.cur"),
TEST(-1, -1, null, "testnonexistant.cur");