monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-16 15:58:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4333

Browse source 
8118355 macOS: remove deprecated screenshot function (tobtoht)
This commit is contained in:
luigi1111 2024-08-13 12:41:22 -04:00
commit af92ca67d7
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
3 changed files with 0 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/oshelper.cpp
View file

@ -70,9 +70,6 @@ namespace
QPixmap screenshot() QPixmap screenshot()
{ {
#ifdef Q_OS_MAC
return MacOSHelper::screenshot();
#else
std::unordered_set<QWindow *> hidden; std::unordered_set<QWindow *> hidden;
const QWindowList windows = QGuiApplication::allWindows(); const QWindowList windows = QGuiApplication::allWindows();
for (QWindow *window : windows) for (QWindow *window : windows)
@ -91,7 +88,6 @@ QPixmap screenshot()
}); });
return QGuiApplication::primaryScreen()->grabWindow(0); return QGuiApplication::primaryScreen()->grabWindow(0);
#endif
} }
} // namespace } // namespace

1
src/qt/macoshelper.h
View file

@ -38,7 +38,6 @@ class MacOSHelper
public: public:
static bool isCapsLock(); static bool isCapsLock();
static bool openFolderAndSelectItem(const QUrl &path); static bool openFolderAndSelectItem(const QUrl &path);
static QPixmap screenshot();
static QString bundlePath(); static QString bundlePath();
static void disableWindowTabbing(); static void disableWindowTabbing();
}; };

35
src/qt/macoshelper.mm
View file

@ -68,41 +68,6 @@ bool MacOSHelper::openFolderAndSelectItem(const QUrl &path)
return true; return true;
} }
QPixmap MacOSHelper::screenshot()
{
std::unordered_set<uintptr_t> appWindowIds;
for (NSWindow *window in [NSApp windows])
{
appWindowIds.insert((uintptr_t)[window windowNumber]);
}
CFArrayRef onScreenWindows = CGWindowListCreate(kCGWindowListOptionOnScreenOnly, kCGNullWindowID);
const auto onScreenWindowsClenaup = sg::make_scope_guard([&onScreenWindows]() {
CFRelease(onScreenWindows);
});
CFMutableArrayRef foreignWindows = CFArrayCreateMutable(NULL, CFArrayGetCount(onScreenWindows), NULL);
const auto foreignWindowsClenaup = sg::make_scope_guard([&foreignWindows]() {
CFRelease(foreignWindows);
});
for (CFIndex index = 0, count = CFArrayGetCount(onScreenWindows); index < count; ++index)
{
const uintptr_t windowId = reinterpret_cast<const uintptr_t>(CFArrayGetValueAtIndex(onScreenWindows, index));
if (appWindowIds.find(windowId) == appWindowIds.end())
{
CFArrayAppendValue(foreignWindows, reinterpret_cast<const void *>(windowId));
}
}
CGImageRef image = CGWindowListCreateImageFromArray(CGRectInfinite, foreignWindows, kCGWindowListOptionAll);
const auto imageClenaup = sg::make_scope_guard([&image]() {
CFRelease(image);
});
return QtMac::fromCGImageRef(image);
}
QString MacOSHelper::bundlePath() QString MacOSHelper::bundlePath()
{ {
NSBundle *main = [NSBundle mainBundle]; NSBundle *main = [NSBundle mainBundle];