X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cca410b336cd5628a944ede9e9944fdbb04552d4..5d3056f180e54cca794622285281491bd1af0e89:/src/gtk/minifram.cpp diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp index ae4a543418..1e4d289f8a 100644 --- a/src/gtk/minifram.cpp +++ b/src/gtk/minifram.cpp @@ -20,6 +20,8 @@ #include "wx/image.h" #endif +#include "wx/gtk/dcclient.h" + #include //----------------------------------------------------------------------------- @@ -58,8 +60,11 @@ static wxColor LightContrastColour(const wxColour& c) extern "C" { static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose* gdk_event, wxMiniFrame* win) { - if (!win->m_hasVMT || gdk_event->count > 0) + if (!win->m_hasVMT || gdk_event->count > 0 || + gdk_event->window != widget->window) + { return false; + } gtk_paint_shadow (widget->style, widget->window, @@ -73,15 +78,9 @@ static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose 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; -#endif + wxDCImpl *impl = dc.GetImpl(); + wxClientDCImpl *gtk_impl = wxDynamicCast( impl, wxClientDCImpl ); + gtk_impl->m_gdkwindow = widget->window; // Hack alert if (style & wxRESIZE_BORDER) { @@ -90,25 +89,25 @@ 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 ); - int height = dc.GetCharHeight(); wxBrush brush( LightContrastColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT) ) ); dc.SetBrush( brush ); dc.SetPen( *wxTRANSPARENT_PEN ); - dc.DrawRectangle( 3, 3, win->m_width - 7, height ); + dc.DrawRectangle( win->m_miniEdge-1, + win->m_miniEdge-1, + win->m_width - (2*(win->m_miniEdge-1)), + 15 ); dc.SetTextForeground( *wxWHITE ); - dc.DrawText( win->GetTitle(), 6, 3 ); + dc.DrawText( win->GetTitle(), 6, 4 ); if (style & wxCLOSE_BOX) - dc.DrawBitmap( win->m_closeButton, win->m_width-19, 2, true ); + dc.DrawBitmap( win->m_closeButton, win->m_width-18, 3, true ); } + return false; } } @@ -118,9 +117,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 (!win->m_hasVMT || gdk_event->window != widget->window) + return false; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; @@ -152,8 +153,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)) { @@ -162,12 +162,8 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton } } - wxClientDC dc(win); - dc.SetFont( *wxSMALL_FONT ); - int height = dc.GetCharHeight() + 1; - - - if (y > height) return TRUE; + if (y >= win->m_miniEdge + win->m_miniTitle) + return true; gdk_window_raise( win->m_widget->window ); @@ -179,8 +175,8 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK), - (GdkWindow *) NULL, - (GdkCursor *) NULL, + NULL, + NULL, (unsigned int) GDK_CURRENT_TIME ); win->m_diffX = x; @@ -199,12 +195,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 (!win->m_hasVMT || gdk_event->window != widget->window) + return false; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; - if (!win->m_isDragging) return TRUE; win->m_isDragging = false; @@ -233,11 +230,13 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto extern "C" { static gboolean gtk_window_leave_callback(GtkWidget *widget, - GdkEventCrossing * WXUNUSED(gdk_event), + GdkEventCrossing* gdk_event, wxMiniFrame *win) { if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; + if (gdk_event->window != widget->window) + return false; gdk_window_set_cursor( widget->window, NULL ); @@ -250,10 +249,11 @@ 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 (!win->m_hasVMT || gdk_event->window != widget->window) + return false; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; @@ -281,6 +281,7 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, gdk_window_set_cursor( widget->window, gdk_cursor_new( GDK_BOTTOM_RIGHT_CORNER ) ); else gdk_window_set_cursor( widget->window, NULL ); + win->GTKUpdateCursor(false); } return TRUE; } @@ -301,21 +302,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 //----------------------------------------------------------------------------- @@ -332,7 +318,8 @@ 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) @@ -347,34 +334,43 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title 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; + gtk_window_set_default_size(GTK_WINDOW(m_widget), m_width, m_height); + 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) ); } - 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); @@ -383,17 +379,17 @@ 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_signal_connect_after(eventbox, "expose_event", G_CALLBACK (gtk_window_own_expose_callback), this ); /* 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; } @@ -413,13 +409,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); + GtkWidget* widget = GTK_BIN(m_widget)->child; + if (widget->window) + gdk_window_invalidate_rect(widget->window, NULL, false); } #endif // wxUSE_MINIFRAME