X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29ae3766ccb6076cf5e875f35ce137905ceb6f79..b5ec0c78b521cfa0f276e4d5d830f35b4fa26e91:/src/gtk/minifram.cpp?ds=sidebyside diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp index e0fa77f064..073587e6af 100644 --- a/src/gtk/minifram.cpp +++ b/src/gtk/minifram.cpp @@ -20,7 +20,14 @@ #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" //----------------------------------------------------------------------------- // data @@ -56,33 +63,47 @@ 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; - gtk_paint_shadow (widget->style, - widget->window, + 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; + } + + gtk_paint_shadow (gtk_widget_get_style(widget), + gtk_widget_get_window(widget), GTK_STATE_NORMAL, GTK_SHADOW_OUT, NULL, NULL, NULL, // FIXME: No clipping? 0, 0, win->m_width, win->m_height); - int style = win->GetWindowStyle(); - wxClientDC dc(win); -#if wxUSE_NEW_DC - wxImplDC *impl = dc.GetImpl(); - wxGTKClientImplDC *client_impl = wxDynamicCast( impl, wxGTKClientImplDC ); - // Hack alert - client_impl->m_window = widget->window; -#else - // Hack alert - dc.m_window = widget->window; + 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) { dc.SetBrush( *wxGREY_BRUSH ); @@ -90,18 +111,15 @@ static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose dc.DrawRectangle( win->m_width - 14, win->m_height-14, 14, 14 ); } - if (!win->GetTitle().empty() && - ((style & wxCAPTION) || - (style & wxTINY_CAPTION_HORIZ) || - (style & wxTINY_CAPTION_VERT))) + if (win->m_miniTitle && !win->GetTitle().empty()) { dc.SetFont( *wxSMALL_FONT ); wxBrush brush( LightContrastColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT) ) ); dc.SetBrush( brush ); dc.SetPen( *wxTRANSPARENT_PEN ); - dc.DrawRectangle( win->m_miniEdge-1, - win->m_miniEdge-1, + dc.DrawRectangle( win->m_miniEdge-1, + win->m_miniEdge-1, win->m_width - (2*(win->m_miniEdge-1)), 15 ); @@ -111,7 +129,7 @@ static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose if (style & wxCLOSE_BOX) dc.DrawBitmap( win->m_closeButton, win->m_width-18, 3, true ); } - + return false; } } @@ -121,9 +139,11 @@ static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose //----------------------------------------------------------------------------- extern "C" { -static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win ) +static gboolean +gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, wxMiniFrame* win) { - if (!win->m_hasVMT) return FALSE; + if (gdk_event->window != gtk_widget_get_window(widget)) + return false; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; @@ -139,7 +159,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton { GtkWidget *ancestor = gtk_widget_get_toplevel( widget ); - GdkWindow *source = widget->window; + GdkWindow *source = gtk_widget_get_window(widget); int org_x = 0; int org_y = 0; @@ -155,8 +175,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton return TRUE; } - if ((style & wxCLOSE_BOX) && - ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))) + if (win->m_miniTitle && (style & wxCLOSE_BOX)) { if ((y > 3) && (y < 19) && (x > win->m_width-19) && (x < win->m_width-3)) { @@ -165,21 +184,25 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton } } - if (y > win->m_miniEdge-1 + 15) return TRUE; + if (y >= win->m_miniEdge + win->m_miniTitle) + return true; - gdk_window_raise( win->m_widget->window ); + gdk_window_raise(gtk_widget_get_window(win->m_widget)); - gdk_pointer_grab( widget->window, 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), - (GdkWindow *) NULL, - (GdkCursor *) 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; @@ -197,12 +220,13 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton //----------------------------------------------------------------------------- extern "C" { -static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win ) +static gboolean +gtk_window_button_release_callback(GtkWidget* widget, GdkEventButton* gdk_event, wxMiniFrame* win) { - if (!win->m_hasVMT) return FALSE; + if (gdk_event->window != gtk_widget_get_window(widget)) + return false; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; - if (!win->m_isDragging) return TRUE; win->m_isDragging = false; @@ -210,10 +234,14 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto 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( widget->window, &org_x, &org_y ); + gdk_window_get_origin(gtk_widget_get_window(widget), &org_x, &org_y); x += org_x - win->m_diffX; y += org_y - win->m_diffY; win->m_x = x; @@ -231,13 +259,14 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto extern "C" { static gboolean gtk_window_leave_callback(GtkWidget *widget, - GdkEventCrossing * WXUNUSED(gdk_event), - wxMiniFrame *win) + GdkEventCrossing* gdk_event, + wxMiniFrame*) { - if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; + if (gdk_event->window != gtk_widget_get_window(widget)) + return false; - gdk_window_set_cursor( widget->window, NULL ); + gdk_window_set_cursor(gtk_widget_get_window(widget), NULL); return FALSE; } @@ -248,37 +277,35 @@ gtk_window_leave_callback(GtkWidget *widget, //----------------------------------------------------------------------------- extern "C" { -static gint +static gboolean gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win ) { - if (!win->m_hasVMT) return FALSE; + 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( widget->window, gdk_cursor_new( GDK_BOTTOM_RIGHT_CORNER ) ); + gdk_window_set_cursor(gtk_widget_get_window(widget), gdk_cursor_new(GDK_BOTTOM_RIGHT_CORNER)); else - gdk_window_set_cursor( widget->window, NULL ); + gdk_window_set_cursor(gtk_widget_get_window(widget), NULL); + win->GTKUpdateCursor(false); } return TRUE; } @@ -288,7 +315,7 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, int org_x = 0; int org_y = 0; - gdk_window_get_origin( widget->window, &org_x, &org_y ); + gdk_window_get_origin(gtk_widget_get_window(widget), &org_x, &org_y); x += org_x - win->m_diffX; y += org_y - win->m_diffY; win->m_x = x; @@ -299,21 +326,6 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, } } -//----------------------------------------------------------------------------- -// "size_allocate" from GtkFixed, parent of m_mainWidget -//----------------------------------------------------------------------------- - -extern "C" { -static void size_allocate(GtkWidget*, GtkAllocation* alloc, wxMiniFrame* win) -{ - // place m_mainWidget inside of decorations drawn on the GtkFixed - GtkAllocation alloc2 = win->m_mainWidget->allocation; - alloc2.width = alloc->width - 2 * win->m_miniEdge; - alloc2.height = alloc->height - win->m_miniTitle - 2 * win->m_miniEdge; - gtk_widget_size_allocate(win->m_mainWidget, &alloc2); -} -} - //----------------------------------------------------------------------------- // wxMiniFrame //----------------------------------------------------------------------------- @@ -326,11 +338,21 @@ 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 ) { - if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)) + m_miniTitle = 0; + if (style & wxCAPTION) m_miniTitle = 16; if (style & wxRESIZE_BORDER) @@ -343,39 +365,47 @@ 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 ); - // borders and title are on a GtkFixed between m_widget and m_mainWidget - GtkWidget* fixed = gtk_fixed_new(); - gtk_fixed_set_has_window((GtkFixed*)fixed, true); - gtk_widget_add_events(fixed, + // Use a GtkEventBox for the title and borders. Using m_widget for this + // almost works, except that setting the resize cursor has no effect. + GtkWidget* eventbox = gtk_event_box_new(); + gtk_widget_add_events(eventbox, GDK_POINTER_MOTION_MASK | - GDK_POINTER_MOTION_HINT_MASK | - GDK_BUTTON_MOTION_MASK | - GDK_BUTTON_PRESS_MASK | - GDK_BUTTON_RELEASE_MASK | - GDK_LEAVE_NOTIFY_MASK); - gtk_widget_show(fixed); - gtk_widget_reparent(m_mainWidget, fixed); - gtk_container_add((GtkContainer*)m_widget, fixed); - gtk_fixed_move((GtkFixed*)fixed, m_mainWidget, m_miniEdge, m_miniTitle + m_miniEdge); - g_signal_connect(fixed, "size_allocate", G_CALLBACK(size_allocate), this); + GDK_POINTER_MOTION_HINT_MASK); + gtk_widget_show(eventbox); + // Use a GtkAlignment to position m_mainWidget inside the decorations + GtkWidget* alignment = gtk_alignment_new(0, 0, 1, 1); + gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), + m_miniTitle + m_miniEdge, m_miniEdge, m_miniEdge, m_miniEdge); + gtk_widget_show(alignment); + // The GtkEventBox and GtkAlignment go between m_widget and m_mainWidget + gtk_widget_reparent(m_mainWidget, alignment); + gtk_container_add(GTK_CONTAINER(eventbox), alignment); + gtk_container_add(GTK_CONTAINER(m_widget), eventbox); m_gdkDecor = 0; m_gdkFunc = 0; if (style & wxRESIZE_BORDER) m_gdkFunc = GDK_FUNC_RESIZE; - - // need to reset default size after changing m_gdkDecor gtk_window_set_default_size(GTK_WINDOW(m_widget), m_width, m_height); + m_decorSize.Set(0, 0); + m_deferShow = false; 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) ); } - if ((style & wxCLOSE_BOX) && - ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))) + if (m_miniTitle && (style & wxCLOSE_BOX)) { wxImage img = wxBitmap((const char*)close_bits, 16, 16).ConvertToImage(); img.Replace(0,0,0,123,123,123); @@ -384,17 +414,20 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title } /* these are called when the borders are drawn */ - g_signal_connect_after(fixed, "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 (fixed, "button_press_event", + g_signal_connect (eventbox, "button_press_event", G_CALLBACK (gtk_window_button_press_callback), this); - g_signal_connect (fixed, "button_release_event", + g_signal_connect (eventbox, "button_release_event", G_CALLBACK (gtk_window_button_release_callback), this); - g_signal_connect (fixed, "motion_notify_event", + g_signal_connect (eventbox, "motion_notify_event", G_CALLBACK (gtk_window_motion_notify_callback), this); - g_signal_connect (fixed, "leave_notify_event", + g_signal_connect (eventbox, "leave_notify_event", G_CALLBACK (gtk_window_leave_callback), this); return true; } @@ -402,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; @@ -414,13 +451,23 @@ void wxMiniFrame::DoGetClientSize(int* width, int* height) const } } +// Keep min size at least as large as decorations +void wxMiniFrame::DoSetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH) +{ + const int w = 2 * m_miniEdge; + const int h = 2 * m_miniEdge + m_miniTitle; + if (minW < w) minW = w; + if (minH < h) minH = h; + wxFrame::DoSetSizeHints(minW, minH, maxW, maxH, incW, incH); +} + void wxMiniFrame::SetTitle( const wxString &title ) { wxFrame::SetTitle( title ); - GtkWidget* fixed = GTK_BIN(m_widget)->child; - if (fixed->window) - gdk_window_invalidate_rect(fixed->window, NULL, false); + GdkWindow* window = gtk_widget_get_window(gtk_bin_get_child(GTK_BIN(m_widget))); + if (window) + gdk_window_invalidate_rect(window, NULL, false); } #endif // wxUSE_MINIFRAME