github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

*CtrlLib: Fixed ColorPopUp issue in X11

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@4307 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2011-12-16 08:46:48 +00:00
parent 7b3157bd6b
commit 0ec63f6df6
5 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/CtrlCore/X11Ctrl.cpp
View file

@ -152,4 +152,4 @@ void Ctrl::SyncCaret() {
END_UPP_NAMESPACE
#endif
#endif

5
uppsrc/CtrlLib/ColorPopup.cpp
View file

@ -317,7 +317,7 @@ Color ColorPopUp::Get() const
}
void ColorPopUp::PopupDeactivate() {
if(popup && popup->IsOpen() && !animating) {
if(popup && popup->IsOpen() && !animating && open) {
popup.Clear();
IgnoreMouseClick();
WhenCancel();
@ -347,6 +347,7 @@ void ColorPopUp::PopUp(Ctrl *owner, Color c)
Rect rt = RectC(x, y, sz.cx, sz.cy);
open = false;
popup.Create();
popup->color = this;
popup->Add(*this);
@ -374,6 +375,7 @@ void ColorPopUp::PopUp(Ctrl *owner, Color c)
if(!popup->IsOpen())
popup->PopUp(owner, true, true, true);
SetFocus();
open = true;
}
void ColorPopUp::Select()
@ -389,6 +391,7 @@ ColorPopUp::ColorPopUp()
scolors = false;
animating = false;
hints = false;
open = false;
SetFrame(MenuFrame());
Add(ramp);
Add(wheel);

1
uppsrc/CtrlLib/DlgColor.h
View file

@ -169,6 +169,7 @@ private:
bool norampwheel;
bool animating;
bool hints;
bool open;
String nulltext;
Color color;

1
uppsrc/CtrlLib/DropChoice.h
View file

@ -14,7 +14,6 @@ protected:
virtual void Deactivate() { table->PopupDeactivate(); }
virtual void CancelMode() { table->PopupCancelMode(); }
};
int droplines;

1
uppsrc/ide/t.cpp
View file

@ -504,6 +504,7 @@ void Ide::SyncT(int kind)
}
catch(CParser::Error& e) {
PutConsole(e);
Exclamation("Failed: \1" + e);
return;
}
}