cocoa: Popup menu positioning, Tree leaf icon

Author: gen2brain

iup/external/src/cocoa/iupcocoa_font.m

@@ -98,21 +98,13 @@ - (void)dealloc
     NSFont *ns_font;
 
 #if defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 110000
-    /* Use modern API on macOS 11+ */
-    NSOperatingSystemVersion version = {11, 0, 0};
-    if ([[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:version])
-    {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
-      ns_font = [NSFont preferredFontForTextStyle:NSFontTextStyleBody options:@{}];
+    ns_font = [NSFont preferredFontForTextStyle:NSFontTextStyleBody options:@{}];
 #pragma clang diagnostic pop
-    }
-    else
+#else
+    ns_font = [NSFont messageFontOfSize:0];
 #endif
-    {
-      /* Fall back to legacy API (or when SDK doesn't have macOS 11+ APIs) */
-      ns_font = [NSFont messageFontOfSize:0];
-    }
 
     IupCocoaFont *iup_font = cocoaCreateIupCocoaFontFromNSFont(ns_font);
     s_systemFont = [iup_font retain];

iup/external/src/cocoa/iupcocoa_info.m

@@ -166,6 +166,8 @@ IUP_SDK_API void iupdrvGetCursorPos(int *x, int *y)
 
   if (x) *x = iupROUND(mouse_point.x);
   if (y) *y = iupROUND(inverted_y);
+
+  iupdrvAddScreenOffset(x, y, -1);
 }
 
 IUP_SDK_API void iupdrvGetKeyState(char* key)

iup/external/src/cocoa/iupcocoa_tree.m

@@ -3939,7 +3939,14 @@ static void helperReplaceDefaultImages(Ihandle* ih, IupCocoaOutlineView* outline
     leaf_image = (NSImage*)iupImageGetImage(leaf_img_name, ih, 0, NULL);
   else
   {
-    leaf_image = [NSImage imageNamed:NSImageNameIChatTheaterTemplate];
+#if defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 110000
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability-new"
+    leaf_image = [NSImage imageWithSystemSymbolName:@"doc.text" accessibilityDescription:nil];
+#pragma clang diagnostic pop
+#else
+    leaf_image = [NSImage imageNamed:NSImageNameMultipleDocuments];
+#endif
     [leaf_image setSize:NSMakeSize(16, 16)];
   }
   [outline_view setLeafImage:leaf_image];