#include "wx/minifram.h"
#ifndef WX_PRECOMP
+ #include "wx/settings.h"
#include "wx/dcscreen.h"
#endif
// "expose_event" of m_mainWidget
//-----------------------------------------------------------------------------
+// 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)
+{
+ int amount = 120;
+
+ // if the color is especially dark, then
+ // make the contrast even lighter
+ if (c.Red() < 128 && c.Green() < 128 && c.Blue() < 128)
+ amount = 160;
+
+ return StepColour(c, amount);
+}
+
extern "C" {
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;
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() &&
((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 );
- 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( 3, 3, win->m_width - 7, height-2 );
+
dc.SetTextForeground( *wxWHITE );
dc.DrawText( win->GetTitle(), 6, 3 );
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;
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 = 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)))
{
return TRUE;
}
}
-
+
wxClientDC dc(win);
dc.SetFont( *wxSMALL_FONT );
int height = dc.GetCharHeight() + 1;
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;
}
}
+//-----------------------------------------------------------------------------
+// "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;
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 );
if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))
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;
((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)))
{
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 );
}
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;
}
{
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 // wxUSE_MINIFRAME
projects / wxWidgets.git / blobdiff