X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb81ee210393b52d2cfbf02a3245076de46cb5ea..89b3361ec25cf1e6d255b14c7633d8375646e4fb:/samples/shaped/shaped.cpp?ds=sidebyside diff --git a/samples/shaped/shaped.cpp b/samples/shaped/shaped.cpp index df4afac07e..e1e3afc17a 100644 --- a/samples/shaped/shaped.cpp +++ b/samples/shaped/shaped.cpp @@ -38,8 +38,13 @@ #endif #include "wx/dcclient.h" +#include "wx/graphics.h" #include "wx/image.h" +#ifndef wxHAS_IMAGES_IN_RESOURCES + #include "../sample.xpm" +#endif + // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -87,6 +92,7 @@ private: void OnShowShaped(wxCommandEvent& event); void OnShowTransparent(wxCommandEvent& event); void OnShowEffect(wxCommandEvent& event); + void OnExit(wxCommandEvent& event); DECLARE_EVENT_TABLE() }; @@ -107,10 +113,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; @@ -153,15 +167,13 @@ public: wxShowEffect effect, // TODO: add menu command to the main frame to allow changing // these parameters - unsigned timeout = 1000, - wxDirection dir = wxBOTTOM) + 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), - m_dir(dir) + m_timeout(timeout) { new wxStaticText(this, wxID_ANY, wxString::Format("Effect: %s", GetEffectName(effect)), @@ -170,7 +182,7 @@ public: wxString::Format("Timeout: %ums", m_timeout), wxPoint(20, 60)); - ShowWithEffect(m_effect, m_timeout, m_dir); + ShowWithEffect(m_effect, m_timeout); Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(EffectFrame::OnClose)); } @@ -180,7 +192,17 @@ private: { static const char *names[] = { - "roll", "slide", "fade", "expand", + "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 ); @@ -190,14 +212,13 @@ private: void OnClose(wxCloseEvent& event) { - HideWithEffect(m_effect, m_timeout, m_dir); + HideWithEffect(m_effect, m_timeout); event.Skip(); } wxShowEffect m_effect; unsigned m_timeout; - wxDirection m_dir; }; // ============================================================================ @@ -234,12 +255,15 @@ 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"); @@ -272,12 +296,75 @@ void MainFrame::OnShowTransparent(wxCommandEvent& WXUNUSED(event)) void MainFrame::OnShowEffect(wxCommandEvent& event) { - int effect = wxSHOW_EFFECT_ROLL + event.GetId() - Show_Effect_Roll; + int effect = event.GetId(); static wxDirection direction = wxLEFT; direction = (wxDirection)(((int)direction)<< 1); if ( direction > wxDOWN ) direction = wxLEFT ; - new EffectFrame(this, wx_static_cast(wxShowEffect, effect),1000,direction); + + 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(); } // ---------------------------------------------------------------------------- @@ -290,12 +377,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() @@ -310,36 +392,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) @@ -381,11 +473,6 @@ void ShapedFrame::OnPaint(wxPaintEvent& WXUNUSED(evt)) dc.DrawBitmap(m_bmp, 0, 0, true); } -void ShapedFrame::OnWindowCreate(wxWindowCreateEvent& WXUNUSED(evt)) -{ - SetWindowShape(); -} - // ---------------------------------------------------------------------------- // see-through frame // ----------------------------------------------------------------------------