omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix zoom detection issue in old OSX versions

Browse Source
This commit is contained in:
omigamedev
2019-08-15 22:52:14 +02:00
parent 56f4bc467d
commit bb7d681dc3
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PanoPainter-OSX/main.cpp
View File

@@ -467,7 +467,9 @@
view = [[View alloc] initWithFrame:r]; view = [[View alloc] initWithFrame:r];
controller = [[Controller alloc] initWithWindow:window]; controller = [[Controller alloc] initWithWindow:window];
App::I->osx_view = view; App::I->osx_view = view;
App::I->zoom = Settings::value_or<Serializer::Float>("ui-scale", (float)view.layer.contentsScale);
float z = (float)window.backingScaleFactor;
App::I->zoom = Settings::value_or<Serializer::Float>("ui-scale", (z > 0.f) ? z : 1.f);
auto style = NSTitledWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask|NSClosableWindowMask; auto style = NSTitledWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask|NSClosableWindowMask;
window = [[Window alloc] initWithContentRect:r styleMask:style backing:NSBackingStoreBuffered defer:NO]; window = [[Window alloc] initWithContentRect:r styleMask:style backing:NSBackingStoreBuffered defer:NO];

7
src/app_events.cpp
View File

@@ -41,6 +41,13 @@ bool App::clipboard_set_text(const std::string& s)
#endif #endif
} }
void App::stacktrace()
{
#if __OSX__
NSString* callstack = [[NSThread callStackSymbols] componentsJoinedByString:@"\n"];
LOG("callstack:\n%s", [callstack cStringUsingEncoding:NSUTF8StringEncoding]);
#endif
}
void App::crash_test() void App::crash_test()
{ {

2
src/app_layout.cpp
View File

@@ -1248,7 +1248,7 @@ void App::initLayout()
}; };
layout.on_loaded = [&] (bool reloaded) { layout.on_loaded = [&] (bool reloaded) {
LOG("initializing layout updating after load"); LOG("initializing layout updating after load %d x %d zoom %f", (int)width, (int)height, zoom);
layout[main_id]->update(width, height, zoom); layout[main_id]->update(width, height, zoom);
LOG("initializing layout components"); LOG("initializing layout components");

1
src/node_canvas.cpp
View File

@@ -621,6 +621,7 @@ void NodeCanvas::reset_camera()
void NodeCanvas::create_buffers() void NodeCanvas::create_buffers()
{ {
auto new_size = GetSize() * m_density; auto new_size = GetSize() * m_density;
LOG("NodeCanvas::create_buffers size: %d x %d density %f", (int)new_size.x, (int)new_size.y, m_density);
m_canvas->m_mixer.create((int)new_size.x * m_canvas->m_mixer_scale, m_canvas->m_mixer.create((int)new_size.x * m_canvas->m_mixer_scale,
(int)new_size.y * m_canvas->m_mixer_scale, -1, GL_RGBA8); (int)new_size.y * m_canvas->m_mixer_scale, -1, GL_RGBA8);
m_blender_rtt.create((int)new_size.x, (int)new_size.y, -1, GL_RGBA8); m_blender_rtt.create((int)new_size.x, (int)new_size.y, -1, GL_RGBA8);