X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/00e4ffbc23dbe47c25dfe35bf4632ddd35e37ede..b5ec0c78b521cfa0f276e4d5d830f35b4fa26e91:/src/gtk/minifram.cpp?ds=inline diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp index 6769171a69..073587e6af 100644 --- a/src/gtk/minifram.cpp +++ b/src/gtk/minifram.cpp @@ -15,16 +15,19 @@ #include "wx/minifram.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" +#ifdef __WXGTK3__ +#include "wx/gtk/dc.h" +#else +#include "wx/gtk/dcclient.h" +#endif -#include -#include -#include +#include +#include "wx/gtk/private/gtk2-compat.h" //----------------------------------------------------------------------------- // data @@ -32,58 +35,102 @@ extern bool g_blockEventsOnDrag; extern bool g_blockEventsOnScroll; -extern GtkWidget *wxGetRootWindow(); //----------------------------------------------------------------------------- // "expose_event" of m_mainWidget //----------------------------------------------------------------------------- -extern "C" { -static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxMiniFrame *win ) +// StepColour() it a utility function that simply darkens +// or lightens a color, based on the specified percentage +static wxColor StepColour(const wxColor& c, int percent) +{ + int r = c.Red(), g = c.Green(), b = c.Blue(); + return wxColour((unsigned char)wxMin((r*percent)/100,255), + (unsigned char)wxMin((g*percent)/100,255), + (unsigned char)wxMin((b*percent)/100,255)); +} + +static wxColor LightContrastColour(const wxColour& c) { - if (g_isIdle) wxapp_install_idle_handler(); + int amount = 120; - if (!win->m_hasVMT) return; - if (gdk_event->count > 0) return; + // if the color is especially dark, then + // make the contrast even lighter + if (c.Red() < 128 && c.Green() < 128 && c.Blue() < 128) + amount = 160; - GtkPizza *pizza = GTK_PIZZA(widget); + return StepColour(c, amount); +} - gtk_paint_shadow (widget->style, - pizza->bin_window, +extern "C" { +#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 +{ +#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; + } + + 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); + 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 (!win->GetTitle().empty() && - ((style & wxCAPTION) || - (style & wxTINY_CAPTION_HORIZ) || - (style & wxTINY_CAPTION_VERT))) + + 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->m_miniTitle && !win->GetTitle().empty()) { - wxClientDC dc(win); dc.SetFont( *wxSMALL_FONT ); - int height = dc.GetCharHeight(); - - GdkGC *gc = gdk_gc_new( pizza->bin_window ); - gdk_gc_set_foreground( gc, &widget->style->bg[GTK_STATE_SELECTED] ); - gdk_draw_rectangle( pizza->bin_window, gc, TRUE, - 3, - 3, - win->m_width - 7, - height+1 ); - g_object_unref (gc); - - // Hack alert - dc.m_window = pizza->bin_window; + + 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, + 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; } } @@ -92,25 +139,43 @@ 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 ) +static gboolean +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 (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; - 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 & wxCLOSE_BOX) && - ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))) + if ((style & wxRESIZE_BORDER) && + (x > win->m_width-14) && (y > win->m_height-14)) + { + GtkWidget *ancestor = gtk_widget_get_toplevel( widget ); + + GdkWindow *source = gtk_widget_get_window(widget); + + 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 (win->m_miniTitle && (style & wxCLOSE_BOX)) { if ((y > 3) && (y < 19) && (x > win->m_width-19) && (x < win->m_width-3)) { @@ -118,27 +183,26 @@ 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; - - gdk_window_raise( win->m_widget->window ); - 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 ); + if (y >= win->m_miniEdge + win->m_miniTitle) + return true; + + gdk_window_raise(gtk_widget_get_window(win->m_widget)); + + 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; @@ -156,14 +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 (g_isIdle) wxapp_install_idle_handler(); - - 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; @@ -171,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; @@ -186,47 +253,75 @@ 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* gdk_event, + wxMiniFrame*) { - if (g_isIdle) wxapp_install_idle_handler(); + if (g_blockEventsOnDrag) return FALSE; + if (gdk_event->window != gtk_widget_get_window(widget)) + return false; - if (!win->m_hasVMT) return FALSE; + gdk_window_set_cursor(gtk_widget_get_window(widget), NULL); + + return FALSE; +} +} + +//----------------------------------------------------------------------------- +// "motion_notify_event" of m_mainWidget +//----------------------------------------------------------------------------- + +extern "C" { +static gboolean +gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win ) +{ + 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; + 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 + } + + if (!win->m_isDragging) + { + 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)); + else + gdk_window_set_cursor(gtk_widget_get_window(widget), NULL); + win->GTKUpdateCursor(false); + } + return TRUE; } - win->m_oldX = (int)gdk_event->x - win->m_diffX; - win->m_oldY = (int)gdk_event->y - win->m_diffY; + win->m_oldX = x - win->m_diffX; + win->m_oldY = y - win->m_diffY; - int x = (int)gdk_event->x; - int y = (int)gdk_event->y; - 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; win->m_y = y; gtk_window_move( GTK_WINDOW(win->m_widget), x, y ); - return TRUE; } } @@ -243,59 +338,136 @@ 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 ) { - style = style | wxCAPTION; - - if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)) + m_miniTitle = 0; + if (style & wxCAPTION) m_miniTitle = 16; - m_miniEdge = 3; + if (style & wxRESIZE_BORDER) + m_miniEdge = 4; + else + m_miniEdge = 3; m_isDragging = false; m_oldX = -1; m_oldY = -1; 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 + // 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); + 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; + 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(255,255,255,123,123,123); - img.Replace(0,0,0,255,255,255); + img.Replace(0,0,0,123,123,123); img.SetMaskColour(123,123,123); m_closeButton = wxBitmap( img ); } /* these are called when the borders are drawn */ - g_signal_connect (m_mainWidget, "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 (m_mainWidget, "button_press_event", + g_signal_connect (eventbox, "button_press_event", G_CALLBACK (gtk_window_button_press_callback), this); - g_signal_connect (m_mainWidget, "button_release_event", + g_signal_connect (eventbox, "button_release_event", G_CALLBACK (gtk_window_button_release_callback), this); - g_signal_connect (m_mainWidget, "motion_notify_event", + g_signal_connect (eventbox, "motion_notify_event", G_CALLBACK (gtk_window_motion_notify_callback), this); - + g_signal_connect (eventbox, "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 (m_useCachedClientSize) + return; + + if (width) + { + *width -= 2 * m_miniEdge; + if (*width < 0) *width = 0; + } + if (height) + { + *height -= m_miniTitle + 2 * m_miniEdge; + if (*height < 0) *height = 0; + } +} + +// 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 ); - gdk_window_invalidate_rect( GTK_PIZZA(m_mainWidget)->bin_window, NULL, true ); + 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