Skip to content

macOS: Adding support for RTL Custom TitleBar #586

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

Open
kdroidFilter wants to merge 1 commit into
base: jbr25
Choose a base branch
from
Open

macOS: Adding support for RTL Custom TitleBar #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
@property (nonatomic, retain) NSNumber *currentDisplayID;
@property (nonatomic, readonly) CGFloat customTitleBarHeight;
@property (nonatomic) BOOL customTitleBarControlsVisible;
@property (nonatomic) BOOL customTitleBarControlsRtl;
@property (nonatomic, retain) NSMutableArray *customTitleBarConstraints;
@property (nonatomic, retain) NSLayoutConstraint *customTitleBarHeightConstraint;
@property (nonatomic, retain) NSMutableArray *customTitleBarButtonCenterXConstraints;
Expand Down
36 changes: 29 additions & 7 deletions src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,6 +1390,7 @@ - (CGFloat) customTitleBarHeight {
DECLARE_CLASS_RETURN(jc_Window, "java/awt/Window", 0.0f);
DECLARE_METHOD_RETURN(jm_internalCustomTitleBarHeight, jc_Window, "internalCustomTitleBarHeight", "()F", 0.0f);
DECLARE_METHOD_RETURN(jm_internalCustomTitleBarControlsVisible, jc_Window, "internalCustomTitleBarControlsVisible", "()Z", 0.0f);
DECLARE_METHOD_RETURN(jm_internalCustomTitleBarControlsRtl, jc_Window, "internalCustomTitleBarControlsRtl", "()Z", 0.0f);

jobject platformWindow = (*env)->NewLocalRef(env, self.javaPlatformWindow);
if (!platformWindow) return 0.0f;
Expand All @@ -1399,6 +1400,9 @@ - (CGFloat) customTitleBarHeight {
if (!(*env)->ExceptionCheck(env)) {
self.customTitleBarControlsVisible = (BOOL) (*env)->CallBooleanMethod(env, target, jm_internalCustomTitleBarControlsVisible);
}
if (!(*env)->ExceptionCheck(env)) {
self.customTitleBarControlsRtl = (BOOL) (*env)->CallBooleanMethod(env, target, jm_internalCustomTitleBarControlsRtl);
}
(*env)->DeleteLocalRef(env, target);
}
CHECK_EXCEPTION();
Expand Down Expand Up @@ -1433,7 +1437,11 @@ - (void) updateCustomTitleBarInsets:(BOOL)hasControls {
if (!platformWindow) return;
jobject target = (*env)->GetObjectField(env, platformWindow, jf_target);
if (target) {
(*env)->CallVoidMethod(env, target, jm_internalCustomTitleBarUpdateInsets, (jfloat) leftInset, (jfloat) 0.0f);
if (self.customTitleBarControlsRtl) {
(*env)->CallVoidMethod(env, target, jm_internalCustomTitleBarUpdateInsets, (jfloat) 0.0f, (jfloat) leftInset);
} else {
(*env)->CallVoidMethod(env, target, jm_internalCustomTitleBarUpdateInsets, (jfloat) leftInset, (jfloat) 0.0f);
}
(*env)->DeleteLocalRef(env, target);
}
CHECK_EXCEPTION();
Expand Down Expand Up @@ -1704,12 +1712,15 @@ - (void) setUpCustomTitleBar {

CGFloat shrinkingFactor = self.customTitleBarButtonShrinkingFactor;
CGFloat horizontalButtonOffset = shrinkingFactor * DefaultHorizontalTitleBarButtonOffset;
BOOL rtl = self.customTitleBarControlsRtl;
NSLayoutAnchor* anchorX = rtl ? titlebarContainer.rightAnchor : titlebarContainer.leftAnchor;
self.customTitleBarButtonCenterXConstraints = [[NSMutableArray alloc] initWithCapacity:3];
[@[closeButtonView, miniaturizeButtonView, zoomButtonView] enumerateObjectsUsingBlock:^(NSView* button, NSUInteger index, BOOL* stop)
{
button.translatesAutoresizingMaskIntoConstraints = NO;
NSLayoutConstraint* buttonCenterXConstraint = [button.centerXAnchor constraintEqualToAnchor:titlebarContainer.leftAnchor
constant:(self.customTitleBarHeight / 2.0 + (index * horizontalButtonOffset))];
CGFloat offset = self.customTitleBarHeight / 2.0 + (index * horizontalButtonOffset);
NSLayoutConstraint* buttonCenterXConstraint = [button.centerXAnchor constraintEqualToAnchor:anchorX
constant:(rtl ? -offset : offset)];
[self.customTitleBarButtonCenterXConstraints addObject:buttonCenterXConstraint];
[self.customTitleBarConstraints addObjectsFromArray:@[
[button.widthAnchor constraintLessThanOrEqualToAnchor:titlebarContainer.heightAnchor multiplier:0.5],
Expand All @@ -1733,9 +1744,11 @@ - (void) updateCustomTitleBarConstraints {
self.customTitleBarHeightConstraint.constant = self.customTitleBarHeight;
CGFloat shrinkingFactor = self.customTitleBarButtonShrinkingFactor;
CGFloat horizontalButtonOffset = shrinkingFactor * DefaultHorizontalTitleBarButtonOffset;
BOOL rtl = self.customTitleBarControlsRtl;
[self.customTitleBarButtonCenterXConstraints enumerateObjectsUsingBlock:^(NSLayoutConstraint* buttonConstraint, NSUInteger index, BOOL *stop)
{
buttonConstraint.constant = (self.customTitleBarHeight / 2.0 + (index * horizontalButtonOffset));
CGFloat offset = self.customTitleBarHeight / 2.0 + (index * horizontalButtonOffset);
buttonConstraint.constant = rtl ? -offset : offset;
}];
[self setWindowControlsHidden:!self.customTitleBarControlsVisible];
[self updateCustomTitleBarInsets:self.customTitleBarControlsVisible];
Expand Down Expand Up @@ -1850,10 +1863,17 @@ - (void)updateFullScreenButtons {
NSView *parent = self.nsWindow.contentView;
CGFloat w = 80;
CGFloat h = _fullScreenOriginalButtons.frame.size.height;
CGFloat x = 6;
CGFloat inset = 6;
CGFloat buttonsWidth = w - inset;
CGFloat x;
if (self.customTitleBarControlsRtl) {
x = parent.frame.size.width - buttonsWidth;
} else {
x = inset;
}
CGFloat y = parent.frame.size.height - h - (self.customTitleBarHeight - h) / 2.0;

[_fullScreenButtons setFrame:NSMakeRect(x, y, w - x, h)];
[_fullScreenButtons setFrame:NSMakeRect(x, y, buttonsWidth, h)];
}

- (void)updateFullScreenButtons: (BOOL) dfm {
Expand Down Expand Up @@ -1891,9 +1911,11 @@ - (void) forceHideCustomTitleBarTitle: (BOOL) hide {
}

- (void) updateCustomTitleBar {
BOOL oldRtl = self.customTitleBarControlsRtl;
_customTitleBarHeight = -1.0f; // Reset for lazy init
BOOL enabled = self.isCustomTitleBarEnabled;
BOOL fullscreen = self.isFullScreen;
BOOL rtlChanged = (oldRtl != self.customTitleBarControlsRtl);

jint mask = [AWTWindow affectedStyleMaskForCustomTitleBar];
jint newBits = [AWTWindow overrideStyleBits:self.styleBits customTitleBarEnabled:enabled fullscreen:fullscreen];
Expand All @@ -1920,7 +1942,7 @@ - (void) updateCustomTitleBar {
[self _deliverMoveResizeEvent];
}

if (enabled != (self.customTitleBarConstraints != nil)) {
if (enabled != (self.customTitleBarConstraints != nil) || (enabled && rtlChanged)) {
if (!fullscreen) {
if (self.isCustomTitleBarEnabled) {
[self setUpCustomTitleBar];
Expand Down
8 changes: 8 additions & 0 deletions src/java.desktop/share/classes/java/awt/Window.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4023,6 +4023,14 @@ private boolean internalCustomTitleBarControlsVisible() {
CustomTitleBar t = customTitleBar;
return t == null || Boolean.TRUE.equals(t.getProperties().getOrDefault("controls.visible", Boolean.TRUE));
}
/**
* Convenience method for JNI access.
* @return true if custom title bar controls should be on the right (RTL).
*/
private boolean internalCustomTitleBarControlsRtl() {
CustomTitleBar t = customTitleBar;
return t != null && Boolean.TRUE.equals(t.getProperties().get("controls.rtl"));
}
/**
* Convenience method for JNI access.
*/
Expand Down