X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85a0a12a9c6fe2885c0de8801e91a2f6d6e4119a..35bb3cb155917b4287fb2a3841bea22919a3d499:/src/gtk/minifram.cpp diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp index 319159f69e..cfbd40bae0 100644 --- a/src/gtk/minifram.cpp +++ b/src/gtk/minifram.cpp @@ -13,19 +13,14 @@ #if wxUSE_MINIFRAME #include "wx/minifram.h" -#include "wx/settings.h" #ifndef WX_PRECOMP - #include "wx/dcscreen.h" + #include "wx/settings.h" + #include "wx/dcclient.h" + #include "wx/image.h" #endif -#include "gtk/gtk.h" -#include "wx/gtk/win_gtk.h" -#include "wx/gtk/private.h" - -#include -#include -#include +#include //----------------------------------------------------------------------------- // data @@ -33,7 +28,6 @@ extern bool g_blockEventsOnDrag; extern bool g_blockEventsOnScroll; -extern GtkWidget *wxGetRootWindow(); //----------------------------------------------------------------------------- // "expose_event" of m_mainWidget @@ -62,17 +56,13 @@ static wxColor LightContrastColour(const wxColour& c) } extern "C" { -static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxMiniFrame *win ) +static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose* gdk_event, wxMiniFrame* win) { - if (g_isIdle) wxapp_install_idle_handler(); - - if (!win->m_hasVMT) return; - if (gdk_event->count > 0) return; - - GtkPizza *pizza = GTK_PIZZA(widget); + if (!win->m_hasVMT || gdk_event->count > 0) + return false; gtk_paint_shadow (widget->style, - pizza->bin_window, + widget->window, GTK_STATE_NORMAL, GTK_SHADOW_OUT, NULL, NULL, NULL, // FIXME: No clipping? @@ -80,11 +70,19 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g 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 - dc.m_window = pizza->bin_window; - + client_impl->m_window = widget->window; +#else + // Hack alert + dc.m_window = widget->window; +#endif + if (style & wxRESIZE_BORDER) { dc.SetBrush( *wxGREY_BRUSH ); @@ -98,19 +96,23 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g (style & wxTINY_CAPTION_VERT))) { 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-2 ); + 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, 3, true ); + dc.DrawBitmap( win->m_closeButton, win->m_width-18, 3, true ); } + + return false; } } @@ -121,28 +123,23 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g extern "C" { static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win ) { - if (g_isIdle) wxapp_install_idle_handler(); - if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; if (win->m_isDragging) return TRUE; - GtkPizza *pizza = GTK_PIZZA(widget); - if (gdk_event->window != pizza->bin_window) return TRUE; - int style = win->GetWindowStyle(); int y = (int)gdk_event->y; int x = (int)gdk_event->x; - + if ((style & wxRESIZE_BORDER) && (x > win->m_width-14) && (y > win->m_height-14)) { GtkWidget *ancestor = gtk_widget_get_toplevel( widget ); - GdkWindow *source = GTK_PIZZA(widget)->bin_window; + GdkWindow *source = widget->window; int org_x = 0; int org_y = 0; @@ -154,7 +151,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton org_x + x, org_y + y, 0); - + return TRUE; } @@ -167,13 +164,8 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton return TRUE; } } - - wxClientDC dc(win); - dc.SetFont( *wxSMALL_FONT ); - int height = dc.GetCharHeight() + 1; - - if (y > height) return TRUE; + if (y > win->m_miniEdge-1 + 15) return TRUE; gdk_window_raise( win->m_widget->window ); @@ -207,8 +199,6 @@ 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 ) { - if (g_isIdle) wxapp_install_idle_handler(); - if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; @@ -240,16 +230,15 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto extern "C" { static gboolean -gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxMiniFrame *win ) +gtk_window_leave_callback(GtkWidget *widget, + GdkEventCrossing * WXUNUSED(gdk_event), + wxMiniFrame *win) { - if (g_isIdle) - wxapp_install_idle_handler(); - if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; gdk_window_set_cursor( widget->window, NULL ); - + return FALSE; } } @@ -259,12 +248,9 @@ gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxMin //----------------------------------------------------------------------------- extern "C" { -static gint +static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win ) { - if (g_isIdle) - wxapp_install_idle_handler(); - if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; @@ -281,10 +267,10 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, } int style = win->GetWindowStyle(); - + int x = (int)gdk_event->x; int y = (int)gdk_event->y; - + if (!win->m_isDragging) { if (style & wxRESIZE_BORDER) @@ -296,7 +282,7 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, } return TRUE; } - + win->m_oldX = x - win->m_diffX; win->m_oldY = y - win->m_diffY; @@ -309,11 +295,25 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, win->m_y = y; gtk_window_move( GTK_WINDOW(win->m_widget), x, y ); - return TRUE; } } +//----------------------------------------------------------------------------- +// "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 //----------------------------------------------------------------------------- @@ -330,8 +330,6 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title const wxPoint &pos, const wxSize &size, long style, const wxString &name ) { - style = style | wxCAPTION; - if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)) m_miniTitle = 16; @@ -347,6 +345,27 @@ 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, + 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); + + m_gdkDecor = 0; + m_gdkFunc = 0; + if (style & wxRESIZE_BORDER) + m_gdkFunc = GDK_FUNC_RESIZE; + 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) ); @@ -362,27 +381,43 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title } /* these are called when the borders are drawn */ - g_signal_connect (m_mainWidget, "expose_event", + g_signal_connect_after(fixed, "expose_event", G_CALLBACK (gtk_window_own_expose_callback), this ); /* these are required for dragging the mini frame around */ - g_signal_connect (m_mainWidget, "button_press_event", + g_signal_connect (fixed, "button_press_event", G_CALLBACK (gtk_window_button_press_callback), this); - g_signal_connect (m_mainWidget, "button_release_event", + g_signal_connect (fixed, "button_release_event", G_CALLBACK (gtk_window_button_release_callback), this); - g_signal_connect (m_mainWidget, "motion_notify_event", + g_signal_connect (fixed, "motion_notify_event", G_CALLBACK (gtk_window_motion_notify_callback), this); - g_signal_connect (m_mainWidget, "leave_notify_event", + g_signal_connect (fixed, "leave_notify_event", G_CALLBACK (gtk_window_leave_callback), this); return true; } +void wxMiniFrame::DoGetClientSize(int* width, int* height) const +{ + wxFrame::DoGetClientSize(width, height); + if (width) + { + *width -= 2 * m_miniEdge; + if (*width < 0) *width = 0; + } + if (height) + { + *height -= m_miniTitle + 2 * m_miniEdge; + if (*height < 0) *height = 0; + } +} + void wxMiniFrame::SetTitle( const wxString &title ) { wxFrame::SetTitle( title ); - if (GTK_PIZZA(m_mainWidget)->bin_window) - gdk_window_invalidate_rect( GTK_PIZZA(m_mainWidget)->bin_window, NULL, true ); + GtkWidget* fixed = GTK_BIN(m_widget)->child; + if (fixed->window) + gdk_window_invalidate_rect(fixed->window, NULL, false); } #endif // wxUSE_MINIFRAME