Skip to content

Make format_coord messagebox resize with the window and the content in osx backend #16710

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

Merged
QuLogic merged 2 commits into from
Mar 12, 2020
Merged

Make format_coord messagebox resize with the window and the content in osx backend #16710

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfaa382
format_coord text resizes with the window and the content
zhihanyue Mar 8, 2020
42eec1e
Limit the max number of lines to 2
zhihanyue Mar 10, 2020
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
27 changes: 23 additions & 4 deletions src/_macosx.m
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,8 +931,9 @@ - (void)save_figure:(id)sender;
typedef struct {
PyObject_HEAD
NSPopUpButton* menu;
NSText* messagebox;
NSTextView* messagebox;
NavigationToolbar2Handler* handler;
int height;
} NavigationToolbar2;

@implementation NavigationToolbar2Handler
Expand Down Expand Up @@ -1139,7 +1140,9 @@ -(void)save_figure:(id)sender
const float gap = 2;
const int height = 36;
const int imagesize = 24;


self->height = height;

const char* basedir;

obj = PyObject_GetAttrString((PyObject*)self, "canvas");
Expand Down Expand Up @@ -1252,7 +1255,9 @@ -(void)save_figure:(id)sender
rect.size.width = 300;
rect.size.height = 0;
rect.origin.x += height;
NSText* messagebox = [[NSText alloc] initWithFrame: rect];
NSTextView* messagebox = [[NSTextView alloc] initWithFrame: rect];
messagebox.textContainer.maximumNumberOfLines = 2;
messagebox.textContainer.lineBreakMode = NSLineBreakByTruncatingTail;
[messagebox setFont: font];
[messagebox setDrawsBackground: NO];
[messagebox setSelectable: NO];
Expand Down Expand Up @@ -1294,12 +1299,26 @@ -(void)save_figure:(id)sender

if(!PyArg_ParseTuple(args, "y", &message)) return NULL;

NSText* messagebox = self->messagebox;
NSTextView* messagebox = self->messagebox;

if (messagebox)
{ NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
NSString* text = [NSString stringWithUTF8String: message];
[messagebox setString: text];

// Adjust width with the window size
NSRect rectWindow = [messagebox.superview frame];
NSRect rect = [messagebox frame];
rect.size.width = rectWindow.size.width - rect.origin.x;
[messagebox setFrame: rect];

// Adjust height with the content size
[messagebox.layoutManager ensureLayoutForTextContainer: messagebox.textContainer];
NSRect contentSize = [messagebox.layoutManager usedRectForTextContainer: messagebox.textContainer];
rect = [messagebox frame];
rect.origin.y = 0.5 * (self->height - contentSize.size.height);
[messagebox setFrame: rect];

[pool release];
}

Expand Down