AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace the sample animation timer with an idle loops and the animation with a busy cursor.

Browse Source 
Fixes #13518, #13658

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton 2011-11-12 20:49:40 +00:00
parent 5ede3d24c8
commit a178852467
1 changed files with 18 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
samples/webview/webview.cpp
View File

@ -69,8 +69,8 @@ public:
WebFrame();
~WebFrame();
void OnAnimationTimer(wxTimerEvent& evt);
void UpdateState();
void OnIdle(wxIdleEvent& evt);
void OnUrl(wxCommandEvent& evt);
void OnBack(wxCommandEvent& evt);
void OnForward(wxCommandEvent& evt);
@ -133,9 +133,6 @@ private:
wxMenuItem* m_selection_clear;
wxMenuItem* m_selection_delete;
wxTimer* m_timer;
int m_animation_angle;
wxInfoBar *m_info;
wxStaticText* m_info_text;
@ -174,10 +171,6 @@ WebFrame::WebFrame() : wxFrame(NULL, wxID_ANY, "wxWebView Sample")
SetIcon(wxICON(sample));
SetTitle("wxWebView Sample");
m_timer = NULL;
m_animation_angle = 0;
wxBoxSizer* topsizer = new wxBoxSizer(wxVERTICAL);
// Create the toolbar
@ -356,48 +349,16 @@ WebFrame::WebFrame() : wxFrame(NULL, wxID_ANY, "wxWebView Sample")
wxCommandEventHandler(WebFrame::OnSelectAll), NULL, this );
Connect(loadscheme->GetId(), wxEVT_COMMAND_MENU_SELECTED,
wxCommandEventHandler(WebFrame::OnLoadScheme), NULL, this );
//Connect the idle events
Connect(wxID_ANY, wxEVT_IDLE, wxIdleEventHandler(WebFrame::OnIdle), NULL, this);
}
WebFrame::~WebFrame()
{
delete m_timer;
delete m_tools_menu;
}
void WebFrame::OnAnimationTimer(wxTimerEvent& WXUNUSED(evt))
{
m_animation_angle += 15;
if (m_animation_angle > 360) m_animation_angle -= 360;
wxBitmap image(24, 24);
{
wxMemoryDC dc;
dc.SelectObject(image);
dc.SetBackground(wxBrush(wxColour(255,0,255)));
dc.Clear();
if (m_animation_angle >= 0 && m_animation_angle <= 180)
{
dc.SetBrush(*wxYELLOW_BRUSH);
dc.SetPen(*wxYELLOW_PEN);
dc.DrawCircle(16 - int(sin(m_animation_angle*0.01745f /* convert to radians */)*14.0f),
16 + int(cos(m_animation_angle*0.01745f /* convert to radians */)*14.0f), 3 );
}
dc.DrawBitmap(wxBitmap(wxlogo_xpm), 0, 0, true);
if (m_animation_angle > 180)
{
dc.SetBrush(*wxYELLOW_BRUSH);
dc.SetPen(*wxYELLOW_PEN);
dc.DrawCircle(16 - int(sin(m_animation_angle*0.01745f /* convert to radians */)*14.0f),
16 + int(cos(m_animation_angle*0.01745f /* convert to radians */)*14.0f), 3 );
}
}
image.SetMask(new wxMask(image, wxColour(255,0,255)));
m_toolbar->SetToolNormalBitmap(m_toolbar_tools->GetId(), image);
}
/**
* Method that retrieves the current state from the web control and updates the GUI
* the reflect this current state.
@ -409,19 +370,10 @@ void WebFrame::UpdateState()
if (m_browser->IsBusy())
{
if (m_timer == NULL)
{
m_timer = new wxTimer(this);
this->Connect(wxEVT_TIMER, wxTimerEventHandler(WebFrame::OnAnimationTimer), NULL, this);
}
m_timer->Start(100); // start animation timer
m_toolbar->EnableTool( m_toolbar_stop->GetId(), true );
}
else
{
if (m_timer != NULL) m_timer->Stop(); // stop animation timer
m_toolbar->SetToolNormalBitmap(m_toolbar_tools->GetId(), wxBitmap(wxlogo_xpm));
m_toolbar->EnableTool( m_toolbar_stop->GetId(), false );
}
@ -429,6 +381,20 @@ void WebFrame::UpdateState()
m_url->SetValue( m_browser->GetCurrentURL() );
}
void WebFrame::OnIdle(wxIdleEvent& evt)
{
if(m_browser->IsBusy())
{
wxSetCursor(wxCURSOR_ARROWWAIT);
m_toolbar->EnableTool(m_toolbar_stop->GetId(), true);
}
else
{
wxSetCursor(wxNullCursor);
m_toolbar->EnableTool(m_toolbar_stop->GetId(), false);
}
}
/**
* Callback invoked when user entered an URL and pressed enter
*/
@ -548,8 +514,6 @@ void WebFrame::OnNavigationRequest(wxWebViewEvent& evt)
if(!m_tools_handle_navigation->IsChecked())
{
evt.Veto();
if (m_timer != NULL) m_timer->Stop(); // stop animation timer
m_toolbar->SetToolNormalBitmap(m_toolbar_tools->GetId(), wxBitmap(wxlogo_xpm));
m_toolbar->EnableTool( m_toolbar_stop->GetId(), false );
}
else