X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/385e8575dd1f9219fb0e3f7fa26ffe4c24d2fdbb..87b621a5b737c09cef079bb4a9ef53be132d2ce0:/src/gtk/minifram.cpp diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp index e7b8f70cb3..073587e6af 100644 --- a/src/gtk/minifram.cpp +++ b/src/gtk/minifram.cpp @@ -20,7 +20,11 @@ #include "wx/image.h" #endif +#ifdef __WXGTK3__ +#include "wx/gtk/dc.h" +#else #include "wx/gtk/dcclient.h" +#endif #include #include "wx/gtk/private/gtk2-compat.h" @@ -59,9 +63,25 @@ static wxColor LightContrastColour(const wxColour& c) } extern "C" { -static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose* gdk_event, wxMiniFrame* win) +#ifdef __WXGTK3__ +static gboolean draw(GtkWidget* widget, cairo_t* cr, wxMiniFrame* win) +#else +static gboolean expose_event(GtkWidget* widget, GdkEventExpose* gdk_event, wxMiniFrame* win) +#endif { - if (!win->m_hasVMT || gdk_event->count > 0 || +#ifdef __WXGTK3__ + if (!gtk_cairo_should_draw_window(cr, gtk_widget_get_window(widget))) + return false; + + GtkStyleContext* sc = gtk_widget_get_style_context(widget); + gtk_style_context_save(sc); + gtk_style_context_add_class(sc, GTK_STYLE_CLASS_BUTTON); + gtk_render_frame(sc, cr, 0, 0, win->m_width, win->m_height); + gtk_style_context_restore(sc); + + wxGTKCairoDC dc(cr); +#else + if (gdk_event->count > 0 || gdk_event->window != gtk_widget_get_window(widget)) { return false; @@ -75,13 +95,14 @@ static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose 0, 0, win->m_width, win->m_height); - int style = win->GetWindowStyle(); - wxClientDC dc(win); wxDCImpl *impl = dc.GetImpl(); wxClientDCImpl *gtk_impl = wxDynamicCast( impl, wxClientDCImpl ); gtk_impl->m_gdkwindow = gtk_widget_get_window(widget); // Hack alert +#endif + + int style = win->GetWindowStyle(); if (style & wxRESIZE_BORDER) { @@ -121,7 +142,7 @@ extern "C" { static gboolean gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, wxMiniFrame* win) { - if (!win->m_hasVMT || gdk_event->window != gtk_widget_get_window(widget)) + if (gdk_event->window != gtk_widget_get_window(widget)) return false; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; @@ -168,17 +189,20 @@ gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, w gdk_window_raise(gtk_widget_get_window(win->m_widget)); - gdk_pointer_grab( gtk_widget_get_window(widget), false, - (GdkEventMask) - (GDK_BUTTON_PRESS_MASK | - GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK | - GDK_POINTER_MOTION_HINT_MASK | - GDK_BUTTON_MOTION_MASK | - GDK_BUTTON1_MOTION_MASK), - NULL, - NULL, - (unsigned int) GDK_CURRENT_TIME ); + const GdkEventMask mask = GdkEventMask( + GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_RELEASE_MASK | + GDK_POINTER_MOTION_MASK | + GDK_POINTER_MOTION_HINT_MASK | + GDK_BUTTON_MOTION_MASK | + GDK_BUTTON1_MOTION_MASK); +#ifdef __WXGTK3__ + gdk_device_grab( + gdk_event->device, gdk_event->window, GDK_OWNERSHIP_NONE, + false, mask, NULL, gdk_event->time); +#else + gdk_pointer_grab(gdk_event->window, false, mask, NULL, NULL, gdk_event->time); +#endif win->m_diffX = x; win->m_diffY = y; @@ -199,7 +223,7 @@ extern "C" { static gboolean gtk_window_button_release_callback(GtkWidget* widget, GdkEventButton* gdk_event, wxMiniFrame* win) { - if (!win->m_hasVMT || gdk_event->window != gtk_widget_get_window(widget)) + if (gdk_event->window != gtk_widget_get_window(widget)) return false; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; @@ -210,7 +234,11 @@ gtk_window_button_release_callback(GtkWidget* widget, GdkEventButton* gdk_event, int x = (int)gdk_event->x; int y = (int)gdk_event->y; - gdk_pointer_ungrab ( (guint32)GDK_CURRENT_TIME ); +#ifdef __WXGTK3__ + gdk_device_ungrab(gdk_event->device, gdk_event->time); +#else + gdk_pointer_ungrab(gdk_event->time); +#endif int org_x = 0; int org_y = 0; gdk_window_get_origin(gtk_widget_get_window(widget), &org_x, &org_y); @@ -232,9 +260,8 @@ extern "C" { static gboolean gtk_window_leave_callback(GtkWidget *widget, GdkEventCrossing* gdk_event, - wxMiniFrame *win) + wxMiniFrame*) { - if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; if (gdk_event->window != gtk_widget_get_window(widget)) return false; @@ -253,30 +280,26 @@ extern "C" { static gboolean gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win ) { - if (!win->m_hasVMT || gdk_event->window != gtk_widget_get_window(widget)) + if (gdk_event->window != gtk_widget_get_window(widget)) return false; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; + int x = int(gdk_event->x); + int y = int(gdk_event->y); + if (gdk_event->is_hint) { - int x = 0; - int y = 0; - GdkModifierType state; - gdk_window_get_pointer(gdk_event->window, &x, &y, &state); - gdk_event->x = x; - gdk_event->y = y; - gdk_event->state = state; +#ifdef __WXGTK3__ + gdk_window_get_device_position(gdk_event->window, gdk_event->device, &x, &y, NULL); +#else + gdk_window_get_pointer(gdk_event->window, &x, &y, NULL); +#endif } - int style = win->GetWindowStyle(); - - int x = (int)gdk_event->x; - int y = (int)gdk_event->y; - if (!win->m_isDragging) { - if (style & wxRESIZE_BORDER) + if (win->GetWindowStyle() & wxRESIZE_BORDER) { if ((x > win->m_width-14) && (y > win->m_height-14)) gdk_window_set_cursor(gtk_widget_get_window(widget), gdk_cursor_new(GDK_BOTTOM_RIGHT_CORNER)); @@ -315,6 +338,15 @@ static unsigned char close_bits[]={ IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame,wxFrame) +wxMiniFrame::~wxMiniFrame() +{ + if (m_widget) + { + GtkWidget* eventbox = gtk_bin_get_child(GTK_BIN(m_widget)); + GTKDisconnect(eventbox); + } +} + bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &pos, const wxSize &size, long style, const wxString &name ) @@ -333,6 +365,14 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title m_diffX = 0; m_diffY = 0; + // don't allow sizing smaller than decorations + int minWidth = 2 * m_miniEdge; + int minHeight = 2 * m_miniEdge + m_miniTitle; + if (m_minWidth < minWidth) + m_minWidth = minWidth; + if (m_minHeight < minHeight) + m_minHeight = minHeight; + wxFrame::Create( parent, id, title, pos, size, style, name ); // Use a GtkEventBox for the title and borders. Using m_widget for this @@ -360,12 +400,6 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title m_decorSize.Set(0, 0); m_deferShow = false; - // don't allow sizing smaller than decorations - GdkGeometry geom; - geom.min_width = 2 * m_miniEdge; - geom.min_height = 2 * m_miniEdge + m_miniTitle; - gtk_window_set_geometry_hints(GTK_WINDOW(m_widget), NULL, &geom, GDK_HINT_MIN_SIZE); - if (m_parent && (GTK_IS_WINDOW(m_parent->m_widget))) { gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) ); @@ -380,8 +414,11 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title } /* these are called when the borders are drawn */ - g_signal_connect_after(eventbox, "expose_event", - G_CALLBACK (gtk_window_own_expose_callback), this ); +#ifdef __WXGTK3__ + g_signal_connect_after(eventbox, "draw", G_CALLBACK(draw), this); +#else + g_signal_connect_after(eventbox, "expose_event", G_CALLBACK(expose_event), this); +#endif /* these are required for dragging the mini frame around */ g_signal_connect (eventbox, "button_press_event", @@ -398,6 +435,10 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title void wxMiniFrame::DoGetClientSize(int* width, int* height) const { wxFrame::DoGetClientSize(width, height); + + if (m_useCachedClientSize) + return; + if (width) { *width -= 2 * m_miniEdge;