Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent widgets from drawing outside their allocation with GTK+3

Browse Source 
See #18043
This commit is contained in:
Paul Cornett
2018-01-28 22:19:46 -08:00
parent a3f56e1869
commit 84c3bc123e
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/window.cpp
View File

@@ -41,6 +41,7 @@
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
#include "wx/gtk/private/gtk2-compat.h" #include "wx/gtk/private/gtk2-compat.h"
#include "wx/gtk/private/gtk3-compat.h"
#include "wx/gtk/private/event.h" #include "wx/gtk/private/event.h"
#include "wx/gtk/private/win_gtk.h" #include "wx/gtk/private/win_gtk.h"
#include "wx/private/textmeasure.h" #include "wx/private/textmeasure.h"
@@ -2191,10 +2192,19 @@ gtk_window_realized_callback(GtkWidget* WXUNUSED(widget), wxWindowGTK* win)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static void static void
size_allocate(GtkWidget*, GtkAllocation* alloc, wxWindow* win) size_allocate(GtkWidget* WXUNUSED_IN_GTK2(widget), GtkAllocation* alloc, wxWindow* win)
{ {
int w = alloc->width; int w = alloc->width;
int h = alloc->height; int h = alloc->height;
#if GTK_CHECK_VERSION(3,14,0)
if (wx_is_at_least_gtk3(14))
{
GtkAllocation clip;
gtk_widget_get_clip(widget, &clip);
if (clip.width > w || clip.height > h)
gtk_widget_set_clip(widget, alloc);
}
#endif
if (win->m_wxwindow) if (win->m_wxwindow)
{ {
GtkBorder border; GtkBorder border;