X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/07d04e37fdffc1bafdadaee417244c3045b760b0..4913272f9cdead94a6d1470e51d6fb14946b50e0:/src/gtk/minifram.cpp diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp index e31c8d0d60..da857b0e6e 100644 --- a/src/gtk/minifram.cpp +++ b/src/gtk/minifram.cpp @@ -10,27 +10,19 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/minifram.h" - #if wxUSE_MINIFRAME -#include "wx/dcscreen.h" +#include "wx/minifram.h" + +#ifndef WX_PRECOMP + #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 - -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -40,35 +32,35 @@ extern bool g_blockEventsOnScroll; extern GtkWidget *wxGetRootWindow(); //----------------------------------------------------------------------------- -// local functions +// "expose_event" of m_mainWidget //----------------------------------------------------------------------------- -/* draw XOR rectangle when moving mine frame around */ +// 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 void DrawFrame( GtkWidget *widget, int x, int y, int w, int h ) +static wxColor LightContrastColour(const wxColour& c) { - int org_x = 0; - int org_y = 0; - gdk_window_get_origin( widget->window, &org_x, &org_y ); - x += org_x; - y += org_y; + int amount = 120; - GdkGC *gc = gdk_gc_new( GDK_ROOT_PARENT() ); - gdk_gc_set_subwindow( gc, GDK_INCLUDE_INFERIORS ); - gdk_gc_set_function( gc, GDK_INVERT ); + // if the color is especially dark, then + // make the contrast even lighter + if (c.Red() < 128 && c.Green() < 128 && c.Blue() < 128) + amount = 160; - gdk_draw_rectangle( GDK_ROOT_PARENT(), gc, FALSE, x, y, w, h ); - gdk_gc_unref( gc ); + return StepColour(c, amount); } -//----------------------------------------------------------------------------- -// "expose_event" of m_mainWidget -//----------------------------------------------------------------------------- - extern "C" { -static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxFrame *win ) +static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxMiniFrame *win ) { - if (g_isIdle) wxapp_install_idle_handler(); + // don't need to install idle handler, its done from "event" signal if (!win->m_hasVMT) return; if (gdk_event->count > 0) return; @@ -83,28 +75,37 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g 0, 0, win->m_width, win->m_height); + int style = win->GetWindowStyle(); + + wxClientDC dc(win); + // Hack alert + dc.m_window = pizza->bin_window; + + 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() && - ((win->GetWindowStyle() & wxCAPTION) || - (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || - (win->GetWindowStyle() & wxTINY_CAPTION_VERT))) + ((style & wxCAPTION) || + (style & wxTINY_CAPTION_HORIZ) || + (style & wxTINY_CAPTION_VERT))) { - 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 ); - gdk_gc_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( 3, 3, win->m_width - 7, height-2 ); + dc.SetTextForeground( *wxWHITE ); dc.DrawText( win->GetTitle(), 6, 3 ); + + if (style & wxCLOSE_BOX) + dc.DrawBitmap( win->m_closeButton, win->m_width-19, 3, true ); } } } @@ -116,7 +117,7 @@ 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(); + // don't need to install idle handler, its done from "event" signal if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return TRUE; @@ -127,11 +128,48 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton 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; + + 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))) + { + if ((y > 3) && (y < 19) && (x > win->m_width-19) && (x < win->m_width-3)) + { + win->Close(); + return TRUE; + } + } + wxClientDC dc(win); dc.SetFont( *wxSMALL_FONT ); int height = dc.GetCharHeight() + 1; - if (gdk_event->y > height) return TRUE; + + if (y > height) return TRUE; gdk_window_raise( win->m_widget->window ); @@ -147,9 +185,8 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton (GdkCursor *) NULL, (unsigned int) GDK_CURRENT_TIME ); - win->m_diffX = (int)gdk_event->x; - win->m_diffY = (int)gdk_event->y; - DrawFrame( widget, 0, 0, win->m_width, win->m_height ); + win->m_diffX = x; + win->m_diffY = y; win->m_oldX = 0; win->m_oldY = 0; @@ -166,7 +203,7 @@ 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(); + // don't need to install idle handler, its done from "event" signal if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return TRUE; @@ -174,12 +211,11 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto if (!win->m_isDragging) return TRUE; - win->m_isDragging = FALSE; + win->m_isDragging = false; int x = (int)gdk_event->x; int y = (int)gdk_event->y; - DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height ); gdk_pointer_ungrab ( (guint32)GDK_CURRENT_TIME ); int org_x = 0; int org_y = 0; @@ -194,21 +230,39 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto } } +//----------------------------------------------------------------------------- +// "leave_notify_event" of m_mainWidget +//----------------------------------------------------------------------------- + +extern "C" { +static gboolean +gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxMiniFrame *win ) +{ + // don't need to install idle handler, its done from "event" signal + + 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 ) +static gint +gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win ) { - if (g_isIdle) wxapp_install_idle_handler(); + // don't need to install idle handler, its done from "event" signal 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; @@ -220,25 +274,37 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion gdk_event->state = state; } - DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height ); - win->m_oldX = (int)gdk_event->x - win->m_diffX; - win->m_oldY = (int)gdk_event->y - win->m_diffY; - DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height ); + int style = win->GetWindowStyle(); - return TRUE; -} -} + int x = (int)gdk_event->x; + int y = (int)gdk_event->y; -//----------------------------------------------------------------------------- -// "clicked" of X system button -//----------------------------------------------------------------------------- + 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; + } -extern "C" { -static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxMiniFrame *mf ) -{ - if (g_isIdle) wxapp_install_idle_handler(); + 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 ); + 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 ); - mf->Close(); + + return TRUE; } } @@ -246,18 +312,11 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxMiniFram // wxMiniFrame //----------------------------------------------------------------------------- -static const char *cross_xpm[] = { -/* columns rows colors chars-per-pixel */ -"5 5 2 1", -"# c Gray0", -" c None", -/* pixels */ -"# #", -" # # ", -" # ", -" # # ", -"# #", -}; +static unsigned char close_bits[]={ + 0xff, 0xff, 0xff, 0xff, 0x07, 0xf0, 0xfb, 0xef, 0xdb, 0xed, 0x8b, 0xe8, + 0x1b, 0xec, 0x3b, 0xee, 0x1b, 0xec, 0x8b, 0xe8, 0xdb, 0xed, 0xfb, 0xef, + 0x07, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame,wxFrame) @@ -268,9 +327,12 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title style = style | wxCAPTION; if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)) - m_miniTitle = 13; + 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; @@ -284,35 +346,13 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) ); } - if ((style & wxSYSTEM_MENU) && + if ((style & wxCLOSE_BOX) && ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))) { - GdkBitmap *mask = (GdkBitmap*) NULL; - GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d - ( - wxGetRootWindow()->window, - &mask, - NULL, - (char **)cross_xpm - ); - - GtkWidget *pw = gtk_pixmap_new( pixmap, mask ); - gdk_bitmap_unref( mask ); - gdk_pixmap_unref( pixmap ); - gtk_widget_show( pw ); - - GtkWidget *close_button = gtk_button_new(); - gtk_container_add( GTK_CONTAINER(close_button), pw ); - - gtk_pizza_put( GTK_PIZZA(m_mainWidget), - close_button, - size.x-16, 4, 11, 11 ); - - gtk_widget_show( close_button ); - - g_signal_connect (close_button, "clicked", - G_CALLBACK (gtk_button_clicked_callback), - this); + wxImage img = wxBitmap((const char*)close_bits, 16, 16).ConvertToImage(); + 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 */ @@ -326,7 +366,8 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title G_CALLBACK (gtk_window_button_release_callback), this); g_signal_connect (m_mainWidget, "motion_notify_event", G_CALLBACK (gtk_window_motion_notify_callback), this); - + g_signal_connect (m_mainWidget, "leave_notify_event", + G_CALLBACK (gtk_window_leave_callback), this); return true; } @@ -334,7 +375,8 @@ void wxMiniFrame::SetTitle( const wxString &title ) { wxFrame::SetTitle( title ); - gdk_window_invalidate_rect( GTK_PIZZA(m_mainWidget)->bin_window, NULL, true ); + if (GTK_PIZZA(m_mainWidget)->bin_window) + gdk_window_invalidate_rect( GTK_PIZZA(m_mainWidget)->bin_window, NULL, true ); } -#endif +#endif // wxUSE_MINIFRAME