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

CtrlCore: Fixed issue with DisplayPopUp and DnD

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10886 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2017-02-28 09:41:34 +00:00
parent ed5c45ec3d
commit bc2d90b166
8 changed files with 275 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

29
uppsrc/CtrlCore/CtrlMouse.cpp
View file

@ -246,6 +246,7 @@ void Ctrl::IgnoreMouseUp()
void Ctrl::UnIgnoreMouse()
{
GuiLock __;
LLOG("Ctrl::EndIgnore");
KillRepeat();
ignoreclick = false;
ignoremouseup = false;
@ -342,8 +343,10 @@ Image Ctrl::MEvent0(int e, Point p, int zd)
void Ctrl::LRepeat() {
GuiLock __;
if(repeatTopCtrl && repeatTopCtrl->HasFocusDeep() && GetMouseLeft()) // 4.7.2004 cxl, IsForeground...
repeatTopCtrl->DispatchMouseEvent(LEFTREPEAT, repeatMousePos, 0);
if(repeatTopCtrl && GetMouseLeft()) {
if(repeatTopCtrl->HasFocusDeep())
repeatTopCtrl->DispatchMouseEvent(LEFTREPEAT, repeatMousePos, 0);
}
else
KillRepeat();
LLOG("LRepeat " << UPP::Name(mouseCtrl));
@ -372,8 +375,10 @@ void Ctrl::LHold() {
void Ctrl::RRepeat() {
GuiLock __;
if(repeatTopCtrl && repeatTopCtrl->IsForeground() && GetMouseRight())
repeatTopCtrl->DispatchMouseEvent(RIGHTREPEAT, repeatMousePos, 0);
if(repeatTopCtrl && GetMouseRight()) {
if(repeatTopCtrl->HasFocusDeep())
repeatTopCtrl->DispatchMouseEvent(RIGHTREPEAT, repeatMousePos, 0);
}
else
KillRepeat();
}
@ -390,8 +395,10 @@ void Ctrl::RHold() {
void Ctrl::MRepeat() {
GuiLock __;
if(repeatTopCtrl && repeatTopCtrl->IsForeground() && GetMouseMiddle())
repeatTopCtrl->DispatchMouseEvent(MIDDLEREPEAT, repeatMousePos, 0);
if(repeatTopCtrl && GetMouseMiddle()) {
if(repeatTopCtrl->HasFocusDeep())
repeatTopCtrl->DispatchMouseEvent(MIDDLEREPEAT, repeatMousePos, 0);
}
else
KillRepeat();
}
@ -505,16 +512,16 @@ bool sDblTime(int time)
Image Ctrl::DispatchMouse(int e, Point p, int zd) {
GuiLock __;
if(e == MOUSEMOVE) {
if(sDistMin(leftmousepos, p) > GUI_DragDistance() && repeatTopCtrl == this && GetMouseLeft()) {
if(e == MOUSEMOVE && repeatTopCtrl == this) {
if(sDistMin(leftmousepos, p) > GUI_DragDistance() && GetMouseLeft()) {
DispatchMouseEvent(LEFTDRAG, leftmousepos, 0);
leftmousepos = Null;
}
if(sDistMin(rightmousepos, p) > GUI_DragDistance() && repeatTopCtrl == this && GetMouseRight()) {
if(sDistMin(rightmousepos, p) > GUI_DragDistance() && GetMouseRight()) {
DispatchMouseEvent(RIGHTDRAG, rightmousepos, 0);
rightmousepos = Null;
}
if(sDistMin(middlemousepos, p) > GUI_DragDistance() && repeatTopCtrl == this && GetMouseMiddle()) {
if(sDistMin(middlemousepos, p) > GUI_DragDistance() && GetMouseMiddle()) {
DispatchMouseEvent(MIDDLEDRAG, middlemousepos, 0);
middlemousepos = Null;
}
@ -573,7 +580,7 @@ Image Ctrl::DispatchMouse(int e, Point p, int zd) {
rightmousepos = Null;
if(e == MIDDLEUP)
rightmousepos = Null;
if(e == LEFTUP || e == RIGHTUP || e == MIDDLEUP)
if(findarg(e, LEFTUP, RIGHTUP, MIDDLEUP) >= 0)
KillRepeat();
Image result = DispatchMouseEvent(e, p, zd);
if(!GetMouseRight() && !GetMouseMiddle() && !GetMouseLeft())

1
uppsrc/CtrlCore/GtkEvent.cpp
View file

@ -361,6 +361,7 @@ void Ctrl::Proc()
SetWndFocus();
ClickActivateWnd();
if(ignoremouseup) {
DLOG("Ignore mouse up KillRepeat");
KillRepeat();
ignoreclick = false;
ignoremouseup = false;

1
uppsrc/CtrlLib/CtrlLib.h
View file

@ -26,6 +26,7 @@ INITIALIZE(CtrlLib);
class Bar;
#include <CtrlLib/LabelBase.h>
#include <CtrlLib/DisplayPopup.h>
#include <CtrlLib/StaticCtrl.h>
#include <CtrlLib/PushCtrl.h>
#include <CtrlLib/MultiButton.h>

2
uppsrc/CtrlLib/CtrlLib.upp
View file

@ -13,6 +13,8 @@ file
CtrlLib readonly separator,
LabelBase.h,
LabelBase.cpp,
DisplayPopup.h,
DisplayPopup.cpp,
PushCtrl.h,
Button.cpp,
Switch.cpp,

210
uppsrc/CtrlLib/DisplayPopup.cpp Normal file
View file

@ -0,0 +1,210 @@
#include "CtrlLib.h"
namespace Upp {
Point DisplayPopup::Op(Point p)
{
return p + GetScreenView().TopLeft() - ctrl->GetScreenView().TopLeft();
}
void DisplayPopup::LeftDown(Point p, dword flags)
{
ctrl->LeftDown(Op(p), flags);
}
void DisplayPopup::LeftDrag(Point p, dword flags)
{
Cancel();
ctrl->LeftDrag(Op(p), flags);
}
void DisplayPopup::LeftDouble(Point p, dword flags)
{
ctrl->LeftDouble(Op(p), flags);
}
void DisplayPopup::RightDown(Point p, dword flags)
{
ctrl->RightDown(Op(p), flags);
}
void DisplayPopup::LeftUp(Point p, dword flags)
{
ctrl->LeftUp(Op(p), flags);
}
void DisplayPopup::MouseWheel(Point p, int zdelta, dword flags)
{
ctrl->MouseWheel(Op(p), zdelta, flags);
}
void DisplayPopup::MouseLeave()
{
Cancel();
}
void DisplayPopup::MouseMove(Point p, dword flags)
{
p += GetScreenView().TopLeft();
if(!slim.Contains(p))
MouseLeave();
}
void DisplayPopup::Paint(Draw& w)
{
Rect r = GetSize();
w.DrawRect(r, SColorPaper);
if(display) {
display->PaintBackground(w, r, value, ink, paper, style);
r.left += margin;
display->Paint(w, r, value, ink, paper, style);
}
}
DisplayPopup::DisplayPopup()
{
SetFrame(BlackFrame());
display = NULL;
paper = ink = Null;
style = 0;
item = slim = Null;
margin = 0;
ONCELOCK {
InstallStateHook(StateHook);
InstallMouseHook(MouseHook);
}
LinkBefore(all());
}
DisplayPopup::~DisplayPopup()
{
Unlink();
}
void DisplayPopup::Sync()
{
if(!IsMainThread()) {
PostCallback(PTEBACK(Sync));
return;
}
if(display && ctrl && !ctrl->IsDragAndDropTarget() && !IsDragAndDropTarget()) {
Ctrl *top = ctrl->GetTopCtrl();
if(top && top->HasFocusDeep()) {
Size sz = display->GetStdSize(value);
if(sz.cx + 2 * margin > item.GetWidth() || sz.cy > item.GetHeight()) {
Rect vw = ctrl->GetScreenView();
slim = (item + vw.TopLeft()) & vw;
if(slim.Contains(GetMousePos())) {
Rect r = item;
r.right = max(r.right, r.left + sz.cx + 2 * margin);
r.bottom = max(r.bottom, r.top + sz.cy);
r.Inflate(1, 1);
Rect v = ctrl->GetScreenView();
r.Offset(v.TopLeft());
Rect wa = GetWorkArea(r.BottomLeft());
Size sz = r.GetSize();
if(r.left < wa.left) {
r.left = wa.left;
r.right = min(wa.right, r.left + sz.cx);
}
else
if(r.right > wa.right) {
r.left = max(wa.left, wa.right - sz.cx);
r.right = wa.right;
}
if(r.top < wa.top) {
r.top = wa.top;
r.bottom = min(wa.bottom, wa.top + sz.cy);
}
else
if(r.bottom > wa.bottom) {
if(wa.bottom - r.top < r.top - wa.top) { // there is more space upside
r.bottom = item.bottom + v.top;
r.top = max(wa.top, r.bottom - sz.cy);
}
else
r.bottom = wa.bottom;
}
SetRect(r);
if(!IsOpen())
Ctrl::PopUp(ctrl, true, false, false);
Refresh();
return;
}
}
}
}
if(IsOpen())
Close();
}
Link<DisplayPopup> *DisplayPopup::all()
{
static Link<DisplayPopup> all;
return &all;
}
void DisplayPopup::SyncAll()
{
int n = 0;
for(DisplayPopup *p = all()->Link<DisplayPopup>::GetNext(); p != all(); p = p->Link<DisplayPopup>::GetNext())
if(p->ctrl && p->ctrl->IsOpen()) {
p->Sync();
n++;
}
}
bool DisplayPopup::StateHook(Ctrl *, int reason)
{
if(reason == FOCUS)
SyncAll();
return false;
}
bool DisplayPopup::MouseHook(Ctrl *, bool, int, Point, int, dword)
{
SyncAll();
return false;
}
void DisplayPopup::Cancel()
{
display = NULL;
Sync();
}
bool DisplayPopup::IsOpen()
{
return Ctrl::IsOpen();
}
bool DisplayPopup::HasMouse()
{
return Ctrl::HasMouse() || ctrl && ctrl->HasMouse();
}
void DisplayPopup::Set(Ctrl *_ctrl, const Rect& _item,
const Value& _value, const Display *_display,
Color _ink, Color _paper, dword _style, int _margin)
{
if(item != _item || ctrl != _ctrl || value != _value || display != _display || ink != _ink ||
paper != _paper || style != _style) {
item = _item;
ctrl = _ctrl;
value = _value;
display = _display;
ink = _ink;
paper = _paper;
style = _style;
margin = _margin;
if(ctrl)
Tip(ctrl->GetTip());
Sync();
}
else
Refresh();
}
}

43
uppsrc/CtrlLib/DisplayPopup.h Normal file
View file

@ -0,0 +1,43 @@
class DisplayPopup : public Ctrl, public Link<DisplayPopup> {
virtual void Paint(Draw& w);
virtual void LeftDown(Point p, dword);
virtual void LeftDrag(Point p, dword);
virtual void LeftDouble(Point p, dword);
virtual void RightDown(Point p, dword);
virtual void LeftUp(Point p, dword);
virtual void MouseWheel(Point p, int zdelta, dword keyflags);
virtual void MouseLeave();
virtual void MouseMove(Point p, dword);
private:
Ptr<Ctrl> ctrl;
Rect item;
Rect slim;
Value value;
Color paper, ink;
dword style;
const Display *display;
int margin;
Point Op(Point p);
void Sync();
static Link<DisplayPopup> *all();
static bool StateHook(Ctrl *, int reason);
static bool MouseHook(Ctrl *, bool, int, Point, int, dword);
static void SyncAll();
typedef DisplayPopup CLASSNAME;
public:
void Set(Ctrl *ctrl, const Rect& item, const Value& v, const Display *display,
Color ink, Color paper, dword style, int margin = 0);
void Cancel();
bool IsOpen();
bool HasMouse();
DisplayPopup();
~DisplayPopup();
};

205
uppsrc/CtrlLib/LabelBase.cpp
View file

@ -451,209 +451,4 @@ Point GetDragScroll(Ctrl *ctrl, Point p, int max)
return GetDragScroll(ctrl, p, Size(max, max));
}
Point DisplayPopup::Op(Point p)
{
return p + GetScreenView().TopLeft() - ctrl->GetScreenView().TopLeft();
}
void DisplayPopup::LeftDown(Point p, dword flags)
{
ctrl->LeftDown(Op(p), flags);
}
void DisplayPopup::LeftDrag(Point p, dword flags)
{
Cancel();
ctrl->LeftDrag(Op(p), flags);
}
void DisplayPopup::LeftDouble(Point p, dword flags)
{
ctrl->LeftDouble(Op(p), flags);
}
void DisplayPopup::RightDown(Point p, dword flags)
{
ctrl->RightDown(Op(p), flags);
}
void DisplayPopup::LeftUp(Point p, dword flags)
{
ctrl->LeftUp(Op(p), flags);
}
void DisplayPopup::MouseWheel(Point p, int zdelta, dword flags)
{
ctrl->MouseWheel(Op(p), zdelta, flags);
}
void DisplayPopup::MouseLeave()
{
Cancel();
}
void DisplayPopup::MouseMove(Point p, dword flags)
{
p += GetScreenView().TopLeft();
if(!slim.Contains(p))
MouseLeave();
}
void DisplayPopup::Paint(Draw& w)
{
Rect r = GetSize();
w.DrawRect(r, SColorPaper);
if(display) {
display->PaintBackground(w, r, value, ink, paper, style);
r.left += margin;
display->Paint(w, r, value, ink, paper, style);
}
}
DisplayPopup::DisplayPopup()
{
SetFrame(BlackFrame());
display = NULL;
paper = ink = Null;
style = 0;
item = slim = Null;
margin = 0;
ONCELOCK {
InstallStateHook(StateHook);
InstallMouseHook(MouseHook);
}
LinkBefore(all());
}
DisplayPopup::~DisplayPopup()
{
Unlink();
}
void DisplayPopup::Sync()
{
if(!IsMainThread()) {
PostCallback(PTEBACK(Sync));
return;
}
if(display && ctrl && !ctrl->IsDragAndDropTarget() && !IsDragAndDropTarget()) {
Ctrl *top = ctrl->GetTopCtrl();
if(top && top->HasFocusDeep()) {
Size sz = display->GetStdSize(value);
if(sz.cx + 2 * margin > item.GetWidth() || sz.cy > item.GetHeight()) {
Rect vw = ctrl->GetScreenView();
slim = (item + vw.TopLeft()) & vw;
if(slim.Contains(GetMousePos())) {
Rect r = item;
r.right = max(r.right, r.left + sz.cx + 2 * margin);
r.bottom = max(r.bottom, r.top + sz.cy);
r.Inflate(1, 1);
Rect v = ctrl->GetScreenView();
r.Offset(v.TopLeft());
Rect wa = GetWorkArea(r.BottomLeft());
Size sz = r.GetSize();
if(r.left < wa.left) {
r.left = wa.left;
r.right = min(wa.right, r.left + sz.cx);
}
else
if(r.right > wa.right) {
r.left = max(wa.left, wa.right - sz.cx);
r.right = wa.right;
}
if(r.top < wa.top) {
r.top = wa.top;
r.bottom = min(wa.bottom, wa.top + sz.cy);
}
else
if(r.bottom > wa.bottom) {
if(wa.bottom - r.top < r.top - wa.top) { // there is more space upside
r.bottom = item.bottom + v.top;
r.top = max(wa.top, r.bottom - sz.cy);
}
else
r.bottom = wa.bottom;
}
SetRect(r);
if(!IsOpen())
Ctrl::PopUp(ctrl, true, false, false);
Refresh();
return;
}
}
}
}
if(IsOpen())
Close();
}
Link<DisplayPopup> *DisplayPopup::all()
{
static Link<DisplayPopup> all;
return &all;
}
void DisplayPopup::SyncAll()
{
int n = 0;
for(DisplayPopup *p = all()->Link<DisplayPopup>::GetNext(); p != all(); p = p->Link<DisplayPopup>::GetNext())
if(p->ctrl && p->ctrl->IsOpen()) {
p->Sync();
n++;
}
}
bool DisplayPopup::StateHook(Ctrl *, int reason)
{
if(reason == FOCUS)
SyncAll();
return false;
}
bool DisplayPopup::MouseHook(Ctrl *, bool, int, Point, int, dword)
{
SyncAll();
return false;
}
void DisplayPopup::Cancel()
{
display = NULL;
Sync();
}
bool DisplayPopup::IsOpen()
{
return Ctrl::IsOpen();
}
bool DisplayPopup::HasMouse()
{
return Ctrl::HasMouse() || ctrl && ctrl->HasMouse();
}
void DisplayPopup::Set(Ctrl *_ctrl, const Rect& _item,
const Value& _value, const Display *_display,
Color _ink, Color _paper, dword _style, int _margin)
{
if(item != _item || ctrl != _ctrl || value != _value || display != _display || ink != _ink ||
paper != _paper || style != _style) {
item = _item;
ctrl = _ctrl;
value = _value;
display = _display;
ink = _ink;
paper = _paper;
style = _style;
margin = _margin;
if(ctrl)
Tip(ctrl->GetTip());
Sync();
}
else
Refresh();
}
}

43
uppsrc/CtrlLib/LabelBase.h
View file

@ -110,46 +110,3 @@ public:
virtual ~LabelBase();
};
class DisplayPopup : public Ctrl, public Link<DisplayPopup> {
virtual void Paint(Draw& w);
virtual void LeftDown(Point p, dword);
virtual void LeftDrag(Point p, dword);
virtual void LeftDouble(Point p, dword);
virtual void RightDown(Point p, dword);
virtual void LeftUp(Point p, dword);
virtual void MouseWheel(Point p, int zdelta, dword keyflags);
virtual void MouseLeave();
virtual void MouseMove(Point p, dword);
private:
Ptr<Ctrl> ctrl;
Rect item;
Rect slim;
Value value;
Color paper, ink;
dword style;
const Display *display;
int margin;
Point Op(Point p);
void Sync();
static Link<DisplayPopup> *all();
static bool StateHook(Ctrl *, int reason);
static bool MouseHook(Ctrl *, bool, int, Point, int, dword);
static void SyncAll();
typedef DisplayPopup CLASSNAME;
public:
void Set(Ctrl *ctrl, const Rect& item, const Value& v, const Display *display,
Color ink, Color paper, dword style, int margin = 0);
void Cancel();
bool IsOpen();
bool HasMouse();
DisplayPopup();
~DisplayPopup();
};