github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-09 11:34:54 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlCore: Gtk WaitCursor issue

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6758 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-01-11 15:58:17 +00:00
parent 1320827163
commit dfcf6f0aa8
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/CtrlCore/CtrlMouse.cpp
View file

@ -686,6 +686,7 @@ Image& Ctrl::CursorOverride()
Image Ctrl::OverrideCursor(const Image& m)
{
LLOG("OverrideCursor");
GuiLock __;
Image om = CursorOverride();
CursorOverride() = m;
@ -702,6 +703,7 @@ void WaitCursor::Show() {
}
WaitCursor::WaitCursor(bool show) {
LLOG("WaitCursor");
flag = true;
if(show) Show();
}

3
uppsrc/CtrlCore/GtkWnd.cpp
View file

@ -72,12 +72,15 @@ Vector<Ctrl *> Ctrl::GetTopCtrls()
void Ctrl::SetMouseCursor(const Image& image)
{
LLOG("SetMouseCursor");
GuiLock __;
int64 id = image.GetSerialId();
Ctrl *topctrl = NULL;
Top *top = NULL;
if(mouseCtrl)
topctrl = mouseCtrl->GetTopCtrl();
else
topctrl = GetActiveCtrl();
if(topctrl)
top = topctrl->top;
if(top && id != top->cursor_id) {