X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd1406f5ced5e53b29cf580f4d8cb2339be2a581..e7bdf0ac8d2f095062b054e1adffd283c1d507a4:/samples/shaped/shaped.cpp diff --git a/samples/shaped/shaped.cpp b/samples/shaped/shaped.cpp index ec2caf1f5f..cc357408ed 100644 --- a/samples/shaped/shaped.cpp +++ b/samples/shaped/shaped.cpp @@ -4,7 +4,6 @@ // Author: Robin Dunn // Modified by: // Created: 28-Mar-2003 -// RCS-ID: $Id$ // Copyright: (c) Robin Dunn // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -38,8 +37,13 @@ #endif #include "wx/dcclient.h" +#include "wx/graphics.h" #include "wx/image.h" +#ifndef wxHAS_IMAGES_IN_RESOURCES + #include "../sample.xpm" +#endif + // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -47,8 +51,16 @@ // menu ids enum { - Show_Shaped, - Show_Transparent + Show_Shaped = 100, + Show_Transparent, + + // must be consecutive and in the same order as wxShowEffect enum elements + Show_Effect_First, + Show_Effect_Roll = Show_Effect_First, + Show_Effect_Slide, + Show_Effect_Blend, + Show_Effect_Expand, + Show_Effect_Last = Show_Effect_Expand }; // ---------------------------------------------------------------------------- @@ -78,6 +90,8 @@ public: private: void OnShowShaped(wxCommandEvent& event); void OnShowTransparent(wxCommandEvent& event); + void OnShowEffect(wxCommandEvent& event); + void OnExit(wxCommandEvent& event); DECLARE_EVENT_TABLE() }; @@ -98,10 +112,18 @@ public: void OnMouseMove(wxMouseEvent& evt); void OnExit(wxMouseEvent& evt); void OnPaint(wxPaintEvent& evt); - void OnWindowCreate(wxWindowCreateEvent& evt); private: - bool m_hasShape; + enum ShapeKind + { + Shape_None, + Shape_Star, +#if wxUSE_GRAPHICS_CONTEXT + Shape_Circle, +#endif // wxUSE_GRAPHICS_CONTEXT + Shape_Max + } m_shapeKind; + wxBitmap m_bmp; wxPoint m_delta; @@ -137,6 +159,67 @@ private: DECLARE_EVENT_TABLE() }; +class EffectFrame : public wxFrame +{ +public: + EffectFrame(wxWindow *parent, + wxShowEffect effect, + // TODO: add menu command to the main frame to allow changing + // these parameters + unsigned timeout = 1000) + : wxFrame(parent, wxID_ANY, + wxString::Format("Frame shown with %s effect", + GetEffectName(effect)), + wxDefaultPosition, wxSize(450, 300)), + m_effect(effect), + m_timeout(timeout) + { + new wxStaticText(this, wxID_ANY, + wxString::Format("Effect: %s", GetEffectName(effect)), + wxPoint(20, 20)); + new wxStaticText(this, wxID_ANY, + wxString::Format("Timeout: %ums", m_timeout), + wxPoint(20, 60)); + + ShowWithEffect(m_effect, m_timeout); + + Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(EffectFrame::OnClose)); + } + +private: + static const char *GetEffectName(wxShowEffect effect) + { + static const char *names[] = + { + "none", + "roll to left", + "roll to right", + "roll to top", + "roll to bottom", + "slide to left", + "slide to right", + "slide to top", + "slide to bottom", + "fade", + "expand", + }; + wxCOMPILE_TIME_ASSERT( WXSIZEOF(names) == wxSHOW_EFFECT_MAX, + EffectNamesMismatch ); + + return names[effect]; + } + + void OnClose(wxCloseEvent& event) + { + HideWithEffect(m_effect, m_timeout); + + event.Skip(); + } + + wxShowEffect m_effect; + unsigned m_timeout; +}; + // ============================================================================ // implementation // ============================================================================ @@ -170,17 +253,26 @@ bool MyApp::OnInit() BEGIN_EVENT_TABLE(MainFrame, wxFrame) EVT_MENU(Show_Shaped, MainFrame::OnShowShaped) EVT_MENU(Show_Transparent, MainFrame::OnShowTransparent) + EVT_MENU_RANGE(Show_Effect_First, Show_Effect_Last, MainFrame::OnShowEffect) + EVT_MENU(wxID_EXIT, MainFrame::OnExit) END_EVENT_TABLE() MainFrame::MainFrame() : wxFrame(NULL, wxID_ANY, "wxWidgets Shaped Sample", wxDefaultPosition, wxSize(200, 100)) { + SetIcon(wxICON(sample)); + wxMenuBar * const mbar = new wxMenuBar; wxMenu * const menuFrames = new wxMenu; menuFrames->Append(Show_Shaped, "Show &shaped window\tCtrl-S"); menuFrames->Append(Show_Transparent, "Show &transparent window\tCtrl-T"); menuFrames->AppendSeparator(); + menuFrames->Append(Show_Effect_Roll, "Show &rolled effect\tCtrl-R"); + menuFrames->Append(Show_Effect_Slide, "Show s&lide effect\tCtrl-L"); + menuFrames->Append(Show_Effect_Blend, "Show &fade effect\tCtrl-F"); + menuFrames->Append(Show_Effect_Expand, "Show &expand effect\tCtrl-E"); + menuFrames->AppendSeparator(); menuFrames->Append(wxID_EXIT, "E&xit"); mbar->Append(menuFrames, "&Show"); @@ -201,6 +293,79 @@ void MainFrame::OnShowTransparent(wxCommandEvent& WXUNUSED(event)) seeThroughFrame->Show(true); } +void MainFrame::OnShowEffect(wxCommandEvent& event) +{ + int effect = event.GetId(); + static wxDirection direction = wxLEFT; + direction = (wxDirection)(((int)direction)<< 1); + if ( direction > wxDOWN ) + direction = wxLEFT ; + + wxShowEffect eff; + switch ( effect ) + { + case Show_Effect_Roll: + switch ( direction ) + { + case wxLEFT: + eff = wxSHOW_EFFECT_ROLL_TO_LEFT; + break; + case wxRIGHT: + eff = wxSHOW_EFFECT_ROLL_TO_RIGHT; + break; + case wxTOP: + eff = wxSHOW_EFFECT_ROLL_TO_TOP; + break; + case wxBOTTOM: + eff = wxSHOW_EFFECT_ROLL_TO_BOTTOM; + break; + default: + wxFAIL_MSG( "invalid direction" ); + return; + } + break; + case Show_Effect_Slide: + switch ( direction ) + { + case wxLEFT: + eff = wxSHOW_EFFECT_SLIDE_TO_LEFT; + break; + case wxRIGHT: + eff = wxSHOW_EFFECT_SLIDE_TO_RIGHT; + break; + case wxTOP: + eff = wxSHOW_EFFECT_SLIDE_TO_TOP; + break; + case wxBOTTOM: + eff = wxSHOW_EFFECT_SLIDE_TO_BOTTOM; + break; + default: + wxFAIL_MSG( "invalid direction" ); + return; + } + break; + + case Show_Effect_Blend: + eff = wxSHOW_EFFECT_BLEND; + break; + + case Show_Effect_Expand: + eff = wxSHOW_EFFECT_EXPAND; + break; + + default: + wxFAIL_MSG( "invalid effect" ); + return; + } + + new EffectFrame(this, eff, 1000); +} + +void MainFrame::OnExit(wxCommandEvent& WXUNUSED(event)) +{ + Close(); +} + // ---------------------------------------------------------------------------- // shaped frame // ---------------------------------------------------------------------------- @@ -211,12 +376,7 @@ BEGIN_EVENT_TABLE(ShapedFrame, wxFrame) EVT_LEFT_UP(ShapedFrame::OnLeftUp) EVT_MOTION(ShapedFrame::OnMouseMove) EVT_RIGHT_UP(ShapedFrame::OnExit) - EVT_PAINT(ShapedFrame::OnPaint) - -#ifdef __WXGTK__ - EVT_WINDOW_CREATE(ShapedFrame::OnWindowCreate) -#endif END_EVENT_TABLE() @@ -231,36 +391,46 @@ ShapedFrame::ShapedFrame(wxFrame *parent) | wxSTAY_ON_TOP ) { - m_hasShape = false; - m_bmp = wxBitmap(_T("star.png"), wxBITMAP_TYPE_PNG); + m_shapeKind = Shape_None; + m_bmp = wxBitmap(wxT("star.png"), wxBITMAP_TYPE_PNG); SetSize(wxSize(m_bmp.GetWidth(), m_bmp.GetHeight())); - SetToolTip(wxT("Right-click to close")); - -#ifndef __WXGTK__ - // On wxGTK we can't do this yet because the window hasn't been created - // yet so we wait until the EVT_WINDOW_CREATE event happens. On wxMSW and - // wxMac the window has been created at this point so we go ahead and set - // the shape now. + SetToolTip(wxT("Right-click to close, double click to cycle shape")); SetWindowShape(); -#endif } void ShapedFrame::SetWindowShape() { - wxRegion region(m_bmp, *wxWHITE); - m_hasShape = SetShape(region); + switch ( m_shapeKind ) + { + case Shape_None: + SetShape(wxRegion()); + break; + + case Shape_Star: + SetShape(wxRegion(m_bmp, *wxWHITE)); + break; + +#if wxUSE_GRAPHICS_CONTEXT + case Shape_Circle: + { + wxGraphicsPath + path = wxGraphicsRenderer::GetDefaultRenderer()->CreatePath(); + path.AddCircle(m_bmp.GetWidth()/2, m_bmp.GetHeight()/2, 30); + SetShape(path); + } + break; +#endif // wxUSE_GRAPHICS_CONTEXT + + case Shape_Max: + wxFAIL_MSG( "invalid shape kind" ); + break; + } } void ShapedFrame::OnDoubleClick(wxMouseEvent& WXUNUSED(evt)) { - if (m_hasShape) - { - wxRegion region; - SetShape(region); - m_hasShape = false; - } - else - SetWindowShape(); + m_shapeKind = static_cast((m_shapeKind + 1) % Shape_Max); + SetWindowShape(); } void ShapedFrame::OnLeftDown(wxMouseEvent& evt) @@ -302,11 +472,6 @@ void ShapedFrame::OnPaint(wxPaintEvent& WXUNUSED(evt)) dc.DrawBitmap(m_bmp, 0, 0, true); } -void ShapedFrame::OnWindowCreate(wxWindowCreateEvent& WXUNUSED(evt)) -{ - SetWindowShape(); -} - // ---------------------------------------------------------------------------- // see-through frame // ---------------------------------------------------------------------------- @@ -324,7 +489,7 @@ SeeThroughFrame::SeeThroughFrame() wxSTAY_ON_TOP), m_currentState(STATE_SEETHROUGH) { - SetBackgroundColour(wxColour(255, 255, 255, 255)); + SetBackgroundColour(*wxWHITE); SetBackgroundStyle(wxBG_STYLE_TRANSPARENT); }