X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4d3971185bf67ebe90c1bee21697b9d8ca733c1..952a3bd46dc50f95c462606fac8214573022f612:/src/gtk/minifram.cpp?ds=sidebyside diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp index e4c0dcf342..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,30 +70,49 @@ 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 + client_impl->m_window = widget->window; +#else + // Hack alert + dc.m_window = widget->window; +#endif + + if (style & wxRESIZE_BORDER) + { + dc.SetBrush( *wxGREY_BRUSH ); + dc.SetPen( *wxTRANSPARENT_PEN ); + 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))) { - wxClientDC dc(win); - // Hack alert - dc.m_window = pizza->bin_window; - 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; } } @@ -114,21 +123,38 @@ 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; - int style = win->GetWindowStyle(); + if ((style & wxRESIZE_BORDER) && + (x > win->m_width-14) && (y > win->m_height-14)) + { + GtkWidget *ancestor = gtk_widget_get_toplevel( widget ); + + GdkWindow *source = widget->window; + + int org_x = 0; + int org_y = 0; + gdk_window_get_origin( source, &org_x, &org_y ); + + gtk_window_begin_resize_drag (GTK_WINDOW (ancestor), + GDK_WINDOW_EDGE_SOUTH_EAST, + 1, + org_x + x, + org_y + y, + 0); + + return TRUE; + } + if ((style & wxCLOSE_BOX) && ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))) { @@ -138,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 ); @@ -178,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; @@ -206,20 +225,36 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto } //----------------------------------------------------------------------------- -// "motion_notify_event" of m_mainWidget +// "leave_notify_event" of m_mainWidget //----------------------------------------------------------------------------- extern "C" { -static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win ) +static gboolean +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; +} +} + +//----------------------------------------------------------------------------- +// "motion_notify_event" of m_mainWidget +//----------------------------------------------------------------------------- + +extern "C" { +static gint +gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win ) +{ if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; - if (!win->m_isDragging) return TRUE; - if (gdk_event->is_hint) { int x = 0; @@ -231,12 +266,26 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion gdk_event->state = state; } - win->m_oldX = (int)gdk_event->x - win->m_diffX; - win->m_oldY = (int)gdk_event->y - win->m_diffY; + 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 ((x > win->m_width-14) && (y > win->m_height-14)) + gdk_window_set_cursor( widget->window, gdk_cursor_new( GDK_BOTTOM_RIGHT_CORNER ) ); + else + gdk_window_set_cursor( widget->window, NULL ); + } + return TRUE; + } + + win->m_oldX = x - win->m_diffX; + win->m_oldY = y - win->m_diffY; + int org_x = 0; int org_y = 0; gdk_window_get_origin( widget->window, &org_x, &org_y ); @@ -246,11 +295,25 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion 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 //----------------------------------------------------------------------------- @@ -267,13 +330,11 @@ 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; if (style & wxRESIZE_BORDER) - m_miniEdge = 5; + m_miniEdge = 4; else m_miniEdge = 3; m_isDragging = false; @@ -284,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) ); @@ -299,25 +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 (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 ); - 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