mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-10 02:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a way for Backend to signal scale changes

Browse Source 
On Wayland the scale now changes to the correct value as the Tracy
window is moved across monitors.

If the scale is overridden from environment, it does not change, just
like before.
This commit is contained in:
Ivan Molodetskikh 2024-01-24 12:34:23 +04:00
parent bf3bd28bfa
commit 16434f116c
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
profiler/src/Backend.hpp
View File

@ -11,7 +11,7 @@ class RunQueue;
class Backend
{
public:
Backend( const char* title, const std::function<void()>& redraw, RunQueue* mainThreadTasks );
Backend( const char* title, const std::function<void()>& redraw, const std::function<void(float)>& scaleChanged, RunQueue* mainThreadTasks );
~Backend();
void Show();

2
profiler/src/BackendGlfw.cpp
View File

@ -60,7 +60,7 @@ static void glfw_window_iconify_callback( GLFWwindow*, int iconified )
}
Backend::Backend( const char* title, const std::function<void()>& redraw, RunQueue* mainThreadTasks )
Backend::Backend( const char* title, const std::function<void()>& redraw, const std::function<void(float)>& scaleChanged, RunQueue* mainThreadTasks )
{
glfwSetErrorCallback( glfw_error_callback );
if( !glfwInit() ) exit( 1 );

5
profiler/src/BackendWayland.cpp
View File

@ -160,6 +160,7 @@ constexpr ImGuiKey s_keyTable[] = {
};
static std::function<void()> s_redraw;
static std::function<void(float)> s_scaleChanged;
static RunQueue* s_mainThreadTasks;
static struct wl_display* s_dpy;
@ -662,9 +663,10 @@ static void SetupCursor()
s_cursorY = cursor->images[0]->hotspot_y / s_maxScale;
}
Backend::Backend( const char* title, const std::function<void()>& redraw, RunQueue* mainThreadTasks )
Backend::Backend( const char* title, const std::function<void()>& redraw, const std::function<void(float)>& scaleChanged, RunQueue* mainThreadTasks )
{
s_redraw = redraw;
s_scaleChanged = scaleChanged;
s_mainThreadTasks = mainThreadTasks;
s_w = m_winPos.w;
s_h = m_winPos.h;
@ -820,6 +822,7 @@ void Backend::NewFrame( int& w, int& h )
{
if( s_prevScale != s_maxScale )
{
s_scaleChanged( s_maxScale );
SetupCursor();
wl_surface_set_buffer_scale( s_surf, s_maxScale );
s_prevScale = s_maxScale;

18
profiler/src/main.cpp
View File

@ -95,6 +95,7 @@ static ConnectionHistory* connHist;
static std::atomic<ViewShutdown> viewShutdown { ViewShutdown::False };
static double animTime = 0;
static float dpiScale = 1.f;
static bool dpiScaleOverriddenFromEnv = false;
static Filters* filt;
static RunQueue mainThreadTasks;
static uint32_t updateVersion = 0;
@ -197,6 +198,15 @@ static bool SaveConfig()
return true;
}
static void ScaleChanged( float scale )
{
if ( dpiScaleOverriddenFromEnv ) return;
if ( dpiScale == scale ) return;
dpiScale = scale;
SetupDPIScale( dpiScale, s_fixedWidth, s_bigFont, s_smallFont );
}
int main( int argc, char** argv )
{
sprintf( title, "Tracy Profiler %i.%i.%i", tracy::Version::Major, tracy::Version::Minor, tracy::Version::Patch );
@ -279,7 +289,7 @@ int main( int argc, char** argv )
LoadConfig();
ImGuiTracyContext imguiContext;
Backend backend( title, DrawContents, &mainThreadTasks );
Backend backend( title, DrawContents, ScaleChanged, &mainThreadTasks );
tracy::InitTexture();
iconTex = tracy::MakeTexture();
zigzagTex = tracy::MakeTexture( true );
@ -292,7 +302,11 @@ int main( int argc, char** argv )
if( envDpiScale )
{
const auto cnv = atof( envDpiScale );
if( cnv != 0 ) dpiScale = cnv;
if( cnv != 0 )
{
dpiScale = cnv;
dpiScaleOverriddenFromEnv = true;
}
}
SetupDPIScale( dpiScale, s_fixedWidth, s_bigFont, s_smallFont );