Skip to content

Try manual changes in library to position buttons correctly #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
AmyMaeTL wants to merge 15 commits into
base: main
Choose a base branch
from
Draft

Try manual changes in library to position buttons correctly #1

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6b8b1fd
Debug: Force 48 height
AmyMaeTL Jul 30, 2024
58e84c6
Debug
AmyMaeTL Jul 30, 2024
7debf40
Name
AmyMaeTL Jul 30, 2024
59b8bc5
QRect
AmyMaeTL Jul 30, 2024
5138338
Viewsize
AmyMaeTL Jul 30, 2024
26037ff
Try to log
AmyMaeTL Jul 30, 2024
aace77d
Center
AmyMaeTL Jul 30, 2024
d9040d4
Test
AmyMaeTL Jul 30, 2024
ea537ce
test
AmyMaeTL Jul 30, 2024
4c732af
I hate this
AmyMaeTL Jul 30, 2024
d6a2836
Change again
AmyMaeTL Jul 30, 2024
4bed47c
warnings
AmyMaeTL Jul 30, 2024
0cbe402
anotehr
AmyMaeTL Jul 30, 2024
7b385dd
kmadkma
AmyMaeTL Jul 30, 2024
900a378
Remove some stuff
AmyMaeTL Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions src/core/contexts/cocoawindowcontext.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <Cocoa/Cocoa.h>

#include <QtGui/QGuiApplication>
#include <QDebug>

#include "qwkglobal_p.h"
#include "systemwindow_p.h"
Expand Down Expand Up @@ -185,6 +186,10 @@ void windowEvent(NSEventType eventType) override {
}

default:
if (!screenRectCallback || !systemButtonVisible) {
return;
}
updateSystemButtonRect();
break;
}
}
Expand Down Expand Up @@ -218,6 +223,8 @@ void updateSystemButtonRect() {
const auto &midButton = buttons[1];
const auto &rightButton = buttons[2];

[rightButton.superview setFrameSize:NSMakeSize(84, 48)];

auto titlebar = rightButton.superview;
int titlebarHeight = titlebar.frame.size.height;

Expand All @@ -233,6 +240,18 @@ void updateSystemButtonRect() {
// do the necessary transformations
center.ry() = titlebarHeight - center.y();

QString log = QString("[DBG] Updating system button rect: TBH: %1 ViewSize: (%2, %3) Center: (%4, %5) ButtonFrame: (%6, %7) Spacing %8")
.arg(titlebarHeight)
.arg(viewSize.width)
.arg(viewSize.height)
.arg(center.x())
.arg(center.y())
.arg(width)
.arg(height)
.arg(spacing);

qInfo() << log;

// Mid button
NSPoint centerOrigin = {
center.x() - width / 2,
Expand Down Expand Up @@ -709,22 +728,22 @@ static inline void releaseWindowProxy(const WId windowId) {
Q_UNUSED(oldAttribute)

if (key == QStringLiteral("no-system-buttons")) {
if (attribute.type() != QVariant::Bool)
if (attribute.typeId() != QMetaType::Bool)
return false;
ensureWindowProxy(m_windowId)->setSystemButtonVisible(!attribute.toBool());
return true;
}

if (key == QStringLiteral("blur-effect")) {
auto mode = NSWindowProxy::BlurMode::None;
if (attribute.type() == QVariant::Bool) {
if (attribute.typeId() == QMetaType::Bool) {
if (attribute.toBool()) {
NSString *osxMode =
[[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"];
mode = [osxMode isEqualToString:@"Dark"] ? NSWindowProxy::BlurMode::Dark
: NSWindowProxy::BlurMode::Light;
}
} else if (attribute.type() == QVariant::String) {
} else if (attribute.typeId() == QMetaType::QString) {
auto value = attribute.toString();
if (value == QStringLiteral("dark")) {
mode = NSWindowProxy::BlurMode::Dark;
Expand Down