mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved handling of high resolution ("retina") displays. 

The new field bool Fl_X::mapped_to_retina is updated when needed, that is, when the window is moved.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10481 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2014-12-11 16:54:30 +00:00
parent 2d0670104b
commit 68a577e1f6
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
FL/mac.H
View File

@ -129,6 +129,7 @@ public:
Fl_X *next; // linked tree to support subwindows
int wait_for_expose;
NSCursor *cursor;
bool mapped_to_retina; // true when window is mapped to a retina display
static Fl_X* first;
static Fl_X* i(const Fl_Window* w) {return w->i;}
static int fake_X_wm(const Fl_Window*,int&,int&,int&,int&,int&);

30
src/Fl_cocoa.mm
View File

@ -1191,6 +1191,16 @@ static FLWindowDelegate *flwindowdelegate_instance = nil;
resize_from_system = NULL;
window->position((int)pt2.x, (int)(main_screen_height - pt2.y));
position_subwindows(window, YES);
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
if (fl_mac_os_version >= 100700) { // determine whether window is now mapped to a retina display
bool *mapped = &(Fl_X::i(window)->mapped_to_retina);
bool previous = *mapped;
NSSize s = [[nsw contentView] convertSizeToBacking:NSMakeSize(10, 10)];
*mapped = (int(s.width + 0.5) > 10);
// window needs redrawn when moving from low res to retina
if ((!previous) && *mapped) window->redraw();
}
#endif
}
fl_unlock_function();
}
@ -2545,23 +2555,6 @@ static FLTextInputContext* fltextinputcontext_instance = nil;
}
@end
// returns the window size in pixels.
// On retina display, values are double of w() x h()
CGSize Fl_X::window_pixel_size(Fl_Window* win)
{
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
if (fl_mac_os_version >= 100700 && win->shown()) {
NSSize s = [[win->i->xid contentView] convertSizeToBacking:NSMakeSize(win->w(), win->h())];
#if __LP64__
return s;
#else
return CGSizeMake(s.width, s.height);
#endif
}
#endif
return CGSizeMake(win->w(), win->h());
}
void Fl_Window::fullscreen_x() {
_set_fullscreen();
/* On OS X < 10.6, it is necessary to recreate the window. This is done
@ -2688,6 +2681,7 @@ void Fl_X::make(Fl_Window* w)
x->subRect = 0;
x->cursor = NULL;
x->gc = 0;
x->mapped_to_retina = false;
NSRect crect;
if (w->fullscreen_active()) {
@ -3001,7 +2995,7 @@ void Fl_Window::make_current()
if (make_current_counts) make_current_counts++;
Fl_X::q_release_context();
fl_window = i->xid;
Fl_X::set_high_resolution( Fl_X::window_pixel_size(this).width > w() + 0.5 );
Fl_X::set_high_resolution( i->mapped_to_retina );
current_ = this;
NSGraphicsContext *nsgc = through_drawRect ? [NSGraphicsContext currentContext] :