Merge 1f9c153ae7 into 6d89a6bc15

Fix thumbnails for macOS Sequoia (fix #5009 )
fix entry
2025-07-24 15:56:15 +00:00 · 2025-07-24 12:53:23 -03:00 · 2025-07-24 12:50:32 -03:00 · 2025-07-24 12:50:32 -03:00 · 2025-07-24 12:50:32 -03:00
12 changed files with 186 additions and 358 deletions
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -86,10 +86,6 @@ if(ENABLE_STEAM)
  add_subdirectory(steam)
 endif()

-if(ENABLE_DESKTOP_INTEGRATION)
-  add_subdirectory(desktop)
-endif()
-
 add_subdirectory(app)

 ######################################################################
@ -187,6 +183,10 @@ if(ENABLE_ASEPRITE_EXE)
  add_executable(${main_target}
    main/main.cpp
    ${main_resources})
+
+  if(ENABLE_DESKTOP_INTEGRATION)
+    add_subdirectory(desktop)
+  endif()
  if(LAF_BACKEND STREQUAL "skia")
    if(WIN32)
      set_target_properties(${main_target} PROPERTIES WIN32_EXECUTABLE true)
--- a/src/desktop/osx/CMakeLists.txt
+++ b/src/desktop/osx/CMakeLists.txt
@ -1,37 +1,23 @@
 # Desktop Integration
-# Copyright (c) 2022  Igara Studio S.A.
+# Copyright (c) 2022-2025  Igara Studio S.A.

-find_library(QUARTZ_LIBRARY Quartz)
+find_library(QUICKLOOK_LIBRARY QuickLookThumbnailing)

-add_library(AsepriteThumbnailer SHARED
-  main.mm
-  thumbnail.mm)
+set(extension_target AsepriteThumbnailer)

-target_link_libraries(AsepriteThumbnailer
-  laf-base
+add_executable(${extension_target}
+  appex/thumbnail.mm)
+
+target_link_libraries(${extension_target}
  dio-lib
  render-lib
-  ${QUARTZ_LIBRARY})
+  ${QUICKLOOK_LIBRARY})

-set_target_properties(AsepriteThumbnailer PROPERTIES
-  FRAMEWORK TRUE
-  MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist")
+set_target_properties(${extension_target} PROPERTIES
+  BUNDLE TRUE
+  BUNDLE_EXTENSION appex
+  MACOSX_BUNDLE TRUE
+  LINK_FLAGS "-Wl,-e,_NSExtensionMain"
+  MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_LIST_DIR}/appex/Info.plist")

-add_custom_command(
-  OUTPUT ${CMAKE_BINARY_DIR}/lib/AsepriteThumbnailer.qlgenerator
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-  COMMAND ${CMAKE_COMMAND} -E make_directory lib/AsepriteThumbnailer.qlgenerator
-  COMMAND ${CMAKE_COMMAND} -E make_directory lib/AsepriteThumbnailer.qlgenerator/Contents
-  COMMAND ${CMAKE_COMMAND} -E make_directory lib/AsepriteThumbnailer.qlgenerator/Contents/MacOS
-  COMMAND ${CMAKE_COMMAND} -E copy
-             lib/AsepriteThumbnailer.framework/Versions/A/AsepriteThumbnailer
-             lib/AsepriteThumbnailer.qlgenerator/Contents/MacOS
-  COMMAND ${CMAKE_COMMAND} -E copy
-             lib/AsepriteThumbnailer.framework/Versions/A/Resources/Info.plist
-             lib/AsepriteThumbnailer.qlgenerator/Contents
-  BYPRODUCTS ${CMAKE_BINARY_DIR}/lib/AsepriteThumbnailer.qlgenerator/Contents/MacOS/AsepriteThumbnailer
-             ${CMAKE_BINARY_DIR}/lib/AsepriteThumbnailer.qlgenerator/Contents/Info.plist
-  DEPENDS AsepriteThumbnailer)
-
-add_custom_target(AsepriteThumbnailer.qlgenerator
-  DEPENDS ${CMAKE_BINARY_DIR}/lib/AsepriteThumbnailer.qlgenerator)
+add_dependencies(${main_target} ${extension_target})
--- a/src/desktop/osx/Info.plist
+++ b/src/desktop/osx/Info.plist
@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>CFBundleDocumentTypes</key>
-        <array>
-                <dict>
-                        <key>CFBundleTypeRole</key>
-                        <string>QLGenerator</string>
-                        <key>LSItemContentTypes</key>
-                        <array>
-                                <string>dyn.ah62d4rv4ge80c65f</string>
-                                <string>dyn.ah62d4rv4ge80c65fsb3gw7df</string>
-                        </array>
-                </dict>
-        </array>
-        <key>CFBundleExecutable</key>
-        <string>AsepriteThumbnailer</string>
-        <key>CFBundleIdentifier</key>
-        <string>org.aseprite.AsepriteThumbnailer</string>
-        <key>CFBundleName</key>
-        <string>AsepriteThumbnailer</string>
-        <key>CFBundleInfoDictionaryVersion</key>
-        <string>6.0</string>
-        <key>CFBundlePackageType</key>
-        <string>XPC!</string>
-        <key>CFBundleShortVersionString</key>
-        <string>1.0</string>
-        <key>CFBundleVersion</key>
-        <string>1.0</string>
-        <key>CFPlugInFactories</key>
-        <dict>
-                <key>A5E9417E-6E7A-4B2D-85A4-84E114D7A960</key>
-                <string>QuickLookGeneratorPluginFactory</string>
-        </dict>
-        <key>CFPlugInTypes</key>
-        <dict>
-                <key>5E2D9680-5022-40FA-B806-43349622E5B9</key>
-                <array>
-                        <string>A5E9417E-6E7A-4B2D-85A4-84E114D7A960</string>
-                </array>
-        </dict>
-        <key>CFPlugInUnloadFunction</key>
-        <string></string>
-        <key>QLThumbnailMinimumSize</key>
-        <real>32</real>
-        <key>QLPreviewWidth</key>
-        <real>256</real>
-        <key>QLPreviewHeight</key>
-        <real>256</real>
-        <key>QLNeedsToBeRunInMainThread</key>
-        <true/>
-        <key>QLSupportsConcurrentRequests</key>
-        <false/>
-        <key>NSHumanReadableCopyright</key>
-        <string>Copyright © Igara Studio S.A. All rights reserved.</string>
-</dict>
-</plist>
--- a/src/desktop/osx/app/Info.plist
+++ b/src/desktop/osx/app/Info.plist
@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>UTExportedTypeDeclarations</key>
+  <array>
+    <dict>
+      <key>UTTypeIdentifier</key>
+      <string>org.aseprite.aseprite.sprite</string>
+      <key>UTTypeDescription</key>
+      <string>Aseprite Sprite</string>
+      <key>UTTypeConformsTo</key>
+      <array>
+          <string>public.image</string>
+      </array>
+      <key>UTTypeTagSpecification</key>
+      <dict>
+        <key>public.filename-extension</key>
+        <array>
+          <string>aseprite</string>
+          <string>ase</string>
+        </array>
+        <key>public.mime-type</key>
+        <string>image/aseprite</string>
+      </dict>
+    </dict>
+  </array>
+  <key>CFBundleIdentifier</key>
+  <string>org.aseprite.aseprite</string>
+  <key>BuildMachineOSBuild</key>
+  <string>24C101</string>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>English</string>
+  <key>CFBundleExecutable</key>
+  <string>aseprite</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundlePackageType</key>
+  <string>APPL</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleSupportedPlatforms</key>
+  <array>
+          <string>MacOSX</string>
+  </array>
+  <key>CSResourcesFileMapped</key>
+  <true/>
+  <key>LSHasPlugIns</key>
+  <true/>
+  <key>DTCompiler</key>
+  <string>com.apple.compilers.llvm.clang.1_0</string>
+  <key>DTPlatformBuild</key>
+  <string>24C94</string>
+  <key>DTPlatformName</key>
+  <string>macosx</string>
+  <key>DTPlatformVersion</key>
+  <string>15.2</string>
+  <key>DTSDKBuild</key>
+  <string>24C94</string>
+  <key>DTSDKName</key>
+  <string>macosx15.2</string>
+  <key>DTXcode</key>
+  <string>1620</string>
+  <key>DTXcodeBuild</key>
+  <string>16C5032a</string>
+  <key>LSMinimumSystemVersion</key>
+  <string>10.15</string>
+</dict>
+</plist>
--- a/src/desktop/osx/app/aseprite.entitlements
+++ b/src/desktop/osx/app/aseprite.entitlements
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+        <true/>
+        <key>com.apple.security.cs.disable-library-validation</key>
+        <true/>
+</dict>
+</plist>
--- a/src/desktop/osx/appex/Info.plist
+++ b/src/desktop/osx/appex/Info.plist
@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>CFBundleIdentifier</key>
+        <string>org.aseprite.aseprite.AsepriteThumbnailer</string>
+        <key>CFBundlePackageType</key>
+        <string>XPC!</string>
+        <key>NSExtension</key>
+        <dict>
+                <key>NSExtensionAttributes</key>
+                <dict>
+                        <key>QLSupportedContentTypes</key>
+                        <array>
+                            <string>org.aseprite.aseprite.sprite</string>
+                        </array>
+                        <key>QLThumbnailMinimumDimension</key>
+                        <integer>32</integer>
+                </dict>
+                <key>NSExtensionPointIdentifier</key>
+                <string>com.apple.quicklook.thumbnail</string>
+                <key>NSExtensionPrincipalClass</key>
+                <string>ThumbnailProvider</string>
+        </dict>
+</dict>
+</plist>
--- a/src/desktop/osx/AsepriteThumbnailer.entitlements
+++ b/src/desktop/osx/AsepriteThumbnailer.entitlements
@ -2,9 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>com.apple.security.app-sandbox</key>
-    <true/>
-    <key>com.apple.security.files.user-selected.read-only</key>
-    <true/>
+        <key>com.apple.security.app-sandbox</key>
+        <true/>
 </dict>
 </plist>
--- a/src/desktop/osx/appex/thumbnail.mm
+++ b/src/desktop/osx/appex/thumbnail.mm
@ -1,11 +1,10 @@
 // Desktop Integration
-// Copyright (c) 2022  Igara Studio S.A.
+// Copyright (c) 2022-2025  Igara Studio S.A.
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.

-#include "thumbnail.h"
-
+#include "app/file_system.h"
 #include "dio/decode_delegate.h"
 #include "dio/decode_file.h"
 #include "dio/file_interface.h"
@ -13,8 +12,7 @@
 #include "render/render.h"

 #include <Cocoa/Cocoa.h>
-
-#include <algorithm>
+#include <QuickLookThumbnailing/QuickLookThumbnailing.h>

 namespace desktop {

@ -87,7 +85,7 @@ public:

 } // anonymous namespace

-CGImageRef get_thumbnail(CFURLRef url, CFDictionaryRef options, CGSize maxSize)
+CGImageRef get_thumbnail(CFURLRef url, CGSize maxSize)
 {
  auto data = [[NSData alloc] initWithContentsOfURL:(NSURL*)url];
  if (!data)
@ -153,3 +151,42 @@ CGImageRef get_thumbnail(CFURLRef url, CFDictionaryRef options, CGSize maxSize)
 }

 } // namespace desktop
+
+@interface ThumbnailProvider : QLThumbnailProvider
+@end
+
+@implementation ThumbnailProvider
+
+- (void)provideThumbnailForFileRequest:(QLFileThumbnailRequest*)request
+                     completionHandler:
+                       (void (^)(QLThumbnailReply* _Nullable, NSError* _Nullable))handler
+{
+  CFURLRef url = (__bridge CFURLRef)(request.fileURL);
+  CGSize maxSize = request.maximumSize;
+  CGImageRef cgImage = desktop::get_thumbnail(url, maxSize);
+  if (!cgImage) {
+    handler(nil, nil);
+    return;
+  }
+  CGSize imageSize = CGSizeMake(CGImageGetWidth(cgImage), CGImageGetHeight(cgImage));
+  handler([QLThumbnailReply replyWithContextSize:maxSize
+                      currentContextDrawingBlock:^BOOL {
+                        CGContextRef ctx = [[NSGraphicsContext currentContext] CGContext];
+                        CGContextSaveGState(ctx);
+                        CGFloat scale = MIN(maxSize.width / imageSize.width,
+                                            maxSize.height / imageSize.height);
+                        CGSize scaledSize = CGSizeMake(imageSize.width * scale,
+                                                       imageSize.height * scale);
+                        CGRect drawRect = CGRectMake((maxSize.width - scaledSize.width) / 2,
+                                                     (maxSize.height - scaledSize.height) / 2,
+                                                     scaledSize.width,
+                                                     scaledSize.height);
+                        CGContextDrawImage(ctx, drawRect, cgImage);
+                        CGContextRestoreGState(ctx);
+                        CGImageRelease(cgImage);
+                        return YES;
+                      }],
+          nil);
+}
+
+@end
--- a/src/desktop/osx/main.mm
+++ b/src/desktop/osx/main.mm
@ -1,234 +0,0 @@
-// Desktop Integration
-// Copyright (c) 2022  Igara Studio S.A.
-//
-// This file is released under the terms of the MIT license.
-// Read LICENSE.txt for more information.
-
-#include <CoreFoundation/CFPlugInCOM.h>
-#include <CoreFoundation/CoreFoundation.h>
-#include <CoreServices/CoreServices.h>
-#include <QuickLook/QuickLook.h>
-
-#include "base/debug.h"
-#include "thumbnail.h"
-
-// Just as a side note: We're using the same UUID as the Windows
-// Aseprite thumbnailer.
-//
-// If you're going to use this code, remember to change this UUID and
-// change it in the Info.plist file.
-#define PLUGIN_ID "A5E9417E-6E7A-4B2D-85A4-84E114D7A960"
-
-static HRESULT Plugin_QueryInterface(void*, REFIID, LPVOID*);
-static ULONG Plugin_AddRef(void*);
-static ULONG Plugin_Release(void*);
-static OSStatus Plugin_GenerateThumbnailForURL(void*,
-                                               QLThumbnailRequestRef,
-                                               CFURLRef,
-                                               CFStringRef,
-                                               CFDictionaryRef,
-                                               CGSize);
-static void Plugin_CancelThumbnailGeneration(void*, QLThumbnailRequestRef);
-static OSStatus Plugin_GeneratePreviewForURL(void*,
-                                             QLPreviewRequestRef,
-                                             CFURLRef,
-                                             CFStringRef,
-                                             CFDictionaryRef);
-static void Plugin_CancelPreviewGeneration(void*, QLPreviewRequestRef);
-
-static QLGeneratorInterfaceStruct Plugin_vtbl = { // kQLGeneratorTypeID interface
-  // IUnknown
-  nullptr, // void* reserved
-  Plugin_QueryInterface,
-  Plugin_AddRef,
-  Plugin_Release,
-  // QLGeneratorInterface
-  Plugin_GenerateThumbnailForURL,
-  Plugin_CancelThumbnailGeneration,
-  Plugin_GeneratePreviewForURL,
-  Plugin_CancelPreviewGeneration
-};
-
-// TODO it would be nice to create a C++ smart pointer/wrapper for CFUUIDRef type
-
-struct Plugin {
-  QLGeneratorInterfaceStruct* interface; // Must be a pointer
-  CFUUIDRef factoryID;
-  ULONG refCount = 1; // Starts with one reference when it's created
-
-  Plugin(CFUUIDRef factoryID)
-    : interface(new QLGeneratorInterfaceStruct(Plugin_vtbl))
-    , factoryID(factoryID)
-  {
-    CFPlugInAddInstanceForFactory(factoryID);
-  }
-
-  ~Plugin()
-  {
-    delete interface;
-    if (factoryID) {
-      CFPlugInRemoveInstanceForFactory(factoryID);
-      CFRelease(factoryID);
-    }
-  }
-
-  // IUnknown impl
-
-  HRESULT QueryInterface(REFIID iid, LPVOID* ppv)
-  {
-    CFUUIDRef interfaceID = CFUUIDCreateFromUUIDBytes(kCFAllocatorDefault, iid);
-
-    if (CFEqual(interfaceID, kQLGeneratorCallbacksInterfaceID)) {
-      *ppv = this;
-      AddRef();
-      CFRelease(interfaceID);
-      return S_OK;
-    }
-    else {
-      *ppv = nullptr;
-      CFRelease(interfaceID);
-      return E_NOINTERFACE;
-    }
-  }
-
-  ULONG AddRef() { return ++refCount; }
-
-  ULONG Release()
-  {
-    if (refCount == 1) {
-      delete this;
-      return 0;
-    }
-    else {
-      ASSERT(refCount != 0);
-      return --refCount;
-    }
-  }
-
-  // QLGeneratorInterfaceStruct impl
-
-  static OSStatus GenerateThumbnailForURL(QLThumbnailRequestRef thumbnail,
-                                          CFURLRef url,
-                                          CFStringRef contentTypeUTI,
-                                          CFDictionaryRef options,
-                                          CGSize maxSize)
-  {
-    CGImageRef image = desktop::get_thumbnail(url, options, maxSize);
-    if (!image)
-      return -1;
-
-    QLThumbnailRequestSetImage(thumbnail, image, nullptr);
-    CGImageRelease(image);
-    return 0;
-  }
-
-  static void CancelThumbnailGeneration(QLThumbnailRequestRef thumbnail)
-  {
-    // TODO
-  }
-
-  OSStatus GeneratePreviewForURL(QLPreviewRequestRef preview,
-                                 CFURLRef url,
-                                 CFStringRef contentTypeUTI,
-                                 CFDictionaryRef options)
-  {
-    CGImageRef image = desktop::get_thumbnail(url, options, CGSizeMake(0, 0));
-    if (!image)
-      return -1;
-
-    int w = CGImageGetWidth(image);
-    int h = CGImageGetHeight(image);
-    int wh = std::min(w, h);
-    if (wh < 128) {
-      w = 128 * w / wh;
-      h = 128 * h / wh;
-    }
-
-    CGContextRef cg = QLPreviewRequestCreateContext(preview, CGSizeMake(w, h), YES, options);
-    CGContextSetInterpolationQuality(cg, kCGInterpolationNone);
-    CGContextDrawImage(cg, CGRectMake(0, 0, w, h), image);
-    QLPreviewRequestFlushContext(preview, cg);
-    CGImageRelease(image);
-    CGContextRelease(cg);
-    return 0;
-  }
-
-  void CancelPreviewGeneration(QLPreviewRequestRef preview)
-  {
-    // TODO
-  }
-};
-
-static HRESULT Plugin_QueryInterface(void* p, REFIID iid, LPVOID* ppv)
-{
-  ASSERT(p);
-  return reinterpret_cast<Plugin*>(p)->QueryInterface(iid, ppv);
-}
-
-static ULONG Plugin_AddRef(void* p)
-{
-  ASSERT(p);
-  return reinterpret_cast<Plugin*>(p)->AddRef();
-}
-
-static ULONG Plugin_Release(void* p)
-{
-  ASSERT(p);
-  return reinterpret_cast<Plugin*>(p)->Release();
-}
-
-static OSStatus Plugin_GenerateThumbnailForURL(void* p,
-                                               QLThumbnailRequestRef thumbnail,
-                                               CFURLRef url,
-                                               CFStringRef contentTypeUTI,
-                                               CFDictionaryRef options,
-                                               CGSize maxSize)
-{
-  ASSERT(p);
-  return reinterpret_cast<Plugin*>(p)->GenerateThumbnailForURL(thumbnail,
-                                                               url,
-                                                               contentTypeUTI,
-                                                               options,
-                                                               maxSize);
-}
-
-static void Plugin_CancelThumbnailGeneration(void* p, QLThumbnailRequestRef thumbnail)
-{
-  ASSERT(p);
-  reinterpret_cast<Plugin*>(p)->CancelThumbnailGeneration(thumbnail);
-}
-
-static OSStatus Plugin_GeneratePreviewForURL(void* p,
-                                             QLPreviewRequestRef preview,
-                                             CFURLRef url,
-                                             CFStringRef contentTypeUTI,
-                                             CFDictionaryRef options)
-{
-  ASSERT(p);
-  return reinterpret_cast<Plugin*>(p)->GeneratePreviewForURL(preview, url, contentTypeUTI, options);
-}
-
-static void Plugin_CancelPreviewGeneration(void* p, QLPreviewRequestRef preview)
-{
-  ASSERT(p);
-  reinterpret_cast<Plugin*>(p)->CancelPreviewGeneration(preview);
-}
-
-// This is the only public entry point of the framework/plugin (the
-// "QuickLookGeneratorPluginFactory" name is specified in the
-// Info.list file): the factory of objects. Similar than the Win32 COM
-// IClassFactory::CreateInstance()
-//
-// This function is used to create an instance of an object of
-// kQLGeneratorTypeID type, which should implement the
-// QLGeneratorInterfaceStruct interface.
-extern "C" void* QuickLookGeneratorPluginFactory(CFAllocatorRef allocator, CFUUIDRef typeID)
-{
-  if (CFEqual(typeID, kQLGeneratorTypeID)) {
-    CFUUIDRef uuid = CFUUIDCreateFromString(kCFAllocatorDefault, CFSTR(PLUGIN_ID));
-    auto plugin = new Plugin(uuid);
-    CFRelease(uuid);
-    return plugin;
-  }
-  return nullptr; // Unknown typeID
-}
--- a/src/desktop/osx/thumbnail.h
+++ b/src/desktop/osx/thumbnail.h
@ -1,19 +0,0 @@
-// Desktop Integration
-// Copyright (c) 2022  Igara Studio S.A.
-//
-// This file is released under the terms of the MIT license.
-// Read LICENSE.txt for more information.
-
-#ifndef DESKTOP_THUMBNAIL_H_INCLUDED
-#define DESKTOP_THUMBNAIL_H_INCLUDED
-
-#include <CoreFoundation/CoreFoundation.h>
-#include <CoreGraphics/CoreGraphics.h>
-
-namespace desktop {
-
-CGImageRef get_thumbnail(CFURLRef url, CFDictionaryRef options, CGSize maxSize);
-
-} // namespace desktop
-
-#endif
--- a/src/ui/entry.cpp
+++ b/src/ui/entry.cpp
@ -128,6 +128,15 @@ int Entry::lastCaretPos() const
  return int(m_boxes.size() - 1);
 }

+gfx::Point Entry::caretPosOnScreen() const
+{
+  const gfx::Point caretPos = getCharBoxBounds(m_caret).point2();
+  const os::Window* nativeWindow = display()->nativeWindow();
+  const gfx::Point pos = nativeWindow->pointToScreen(caretPos + bounds().origin());
+
+  return pos;
+}
+
 void Entry::setCaretPos(const int pos)
 {
  gfx::Size caretSize = theme()->getEntryCaretSize(this);
@ -160,6 +169,8 @@ void Entry::setCaretPos(const int pos)
    startTimer();
  m_state = true;

+  os::System::instance()->setTextInput(true, caretPosOnScreen());
+
  invalidate();
 }

@ -251,7 +262,7 @@ gfx::Rect Entry::getEntryTextBounds() const
  return onGetEntryTextBounds();
 }

-gfx::Rect Entry::getCharBoxBounds(const int i)
+gfx::Rect Entry::getCharBoxBounds(const int i) const
 {
  ASSERT(i >= 0 && i < int(m_boxes.size()));
  if (i >= 0 && i < int(m_boxes.size()))
@ -288,8 +299,9 @@ bool Entry::onProcessMessage(Message* msg)
      }

      // Start processing dead keys
-      if (m_translate_dead_keys)
-        os::System::instance()->setTextInput(true);
+      if (m_translate_dead_keys) {
+        os::System::instance()->setTextInput(true, caretPosOnScreen());
+      }
      break;

    case kFocusLeaveMessage:
--- a/src/ui/entry.h
+++ b/src/ui/entry.h
@ -43,6 +43,7 @@ public:

  int caretPos() const { return m_caret; }
  int lastCaretPos() const;
+  gfx::Point caretPosOnScreen() const;

  void setCaretPos(int pos);
  void setCaretToEnd();
@ -76,7 +77,7 @@ public:
  obs::signal<void()> Change;

 protected:
-  gfx::Rect getCharBoxBounds(int i);
+  gfx::Rect getCharBoxBounds(int i) const;

  // Events
  bool onProcessMessage(Message* msg) override;
Author	SHA1	Message	Date
Gaspar Capello	e3942527a7	Merge `1f9c153ae7` into `6d89a6bc15`	2025-07-24 15:56:15 +00:00
Gaspar Capello	1f9c153ae7	Fix thumbnails for macOS Sequoia (fix #5009 )	2025-07-24 12:53:23 -03:00
Cerallin	6d89a6bc15	fix entry build-auto / build-auto (Debug, macos-latest) (push) Has been cancelled Details build-auto / build-auto (Debug, ubuntu-latest) (push) Has been cancelled Details build-auto / build-auto (Debug, windows-latest) (push) Has been cancelled Details build-auto / build-auto (RelWithDebInfo, macos-latest) (push) Has been cancelled Details build-auto / build-auto (RelWithDebInfo, ubuntu-latest) (push) Has been cancelled Details build-auto / build-auto (RelWithDebInfo, windows-latest) (push) Has been cancelled Details build / build (Debug, macos-latest, lua, cli) (push) Has been cancelled Details build / build (Debug, macos-latest, noscripts, cli) (push) Has been cancelled Details build / build (Debug, ubuntu-latest, lua, cli) (push) Has been cancelled Details build / build (Debug, ubuntu-latest, noscripts, cli) (push) Has been cancelled Details build / build (Debug, windows-latest, lua, cli) (push) Has been cancelled Details build / build (Debug, windows-latest, noscripts, cli) (push) Has been cancelled Details build / build (RelWithDebInfo, macos-latest, lua, gui) (push) Has been cancelled Details build / build (RelWithDebInfo, ubuntu-latest, lua, gui) (push) Has been cancelled Details build / build (RelWithDebInfo, windows-latest, lua, gui) (push) Has been cancelled Details	2025-07-24 12:50:32 -03:00
Cerallin	d4e97b5a96	Add const method Entry::caretPosOnScreen() This method is for Entry::setTextInput() and IME positioning.	2025-07-24 12:50:32 -03:00
Cerallin	205b18dc0f	Make Entry::getCharBoxBounds() a const method	2025-07-24 12:50:32 -03:00