juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improves usability on Linux. No more double title bar (#12600)

Browse Source 
* Fix double title bar on Linux by removing WM decorations for GTK

* wip

* fix

* finish

* address review comment
This commit is contained in:
SoftFever
2026-03-04 22:29:27 +08:00
committed by GitHub
parent 47ab79041b
commit d50b4cbf3d
4 changed files with 191 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/slic3r/GUI/BBLTopbar.cpp
View File

@@ -13,6 +13,10 @@
#include <boost/log/trivial.hpp>
#ifdef __WXGTK__
#include <gtk/gtk.h>
#endif
#define TOPBAR_ICON_SIZE 18
#define TOPBAR_TITLE_WIDTH 300
@@ -532,6 +536,18 @@ void BBLTopbar::OnIconize(wxAuiToolBarEvent& event)
void BBLTopbar::OnFullScreen(wxAuiToolBarEvent& event)
{
#ifdef __WXGTK__
GtkWindow* gtk_window = GTK_WINDOW(m_frame->m_widget);
if (gtk_window_is_maximized(gtk_window)) {
gtk_window_unmaximize(gtk_window);
}
else {
m_normalRect = m_frame->GetRect();
gtk_window_maximize(gtk_window);
}
return;
#endif
if (m_frame->IsMaximized()) {
m_frame->Restore();
}
@@ -621,17 +637,27 @@ void BBLTopbar::OnMouseLeftDown(wxMouseEvent& event)
wxPoint frame_pos = m_frame->GetScreenPosition();
m_delta = mouse_pos - frame_pos;
if (FindToolByCurrentPosition() == NULL
if (FindToolByCurrentPosition() == NULL
|| this->FindToolByCurrentPosition() == m_title_item)
{
CaptureMouse();
#ifdef __WXMSW__
CaptureMouse();
ReleaseMouse();
::PostMessage((HWND) m_frame->GetHandle(), WM_NCLBUTTONDOWN, HTCAPTION, MAKELPARAM(mouse_pos.x, mouse_pos.y));
return;
#endif // __WXMSW__
#elif defined(__WXGTK__)
// Use WM-integrated drag for smoother window movement on Linux.
gtk_window_begin_move_drag(
GTK_WINDOW(m_frame->m_widget),
1, // left mouse button
mouse_pos.x, mouse_pos.y,
gtk_get_current_event_time());
return;
#else
CaptureMouse();
#endif
}
event.Skip();
}