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

RichEdit: DiagramEditor selection

Browse source
This commit is contained in:
Mirek Fidler 2025-06-26 23:20:30 +02:00
parent 8c0164b8a2
commit e471f7d0eb
1 changed files with 11 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

33
uppsrc/RichEdit/DiagramMouse.cpp
View file

@ -44,21 +44,11 @@ int DiagramEditor::FindItem(Point p) const
double mina = INT_MAX;
for(int i = data.item.GetCount() - 1; i >= 0; i--) {
Rectf r = data.item[i].GetRect();
DLOG("==========================");
DDUMP(i);
DDUMP(r);
DDUMP(p);
DDUMP(data.item[i].IsLine());
DDUMP(data.item[i].GetRect().Inflated(5).Contains(p));
DDUMP(data.item[i].IsClick(p));
if(data.item[i].IsClick(p) || data.item[i].IsTextClick(p)) {
double a = r.Width() * r.Height();
DDUMP(a);
DDUMP(mina);
if(a < mina) {
mina = a;
mini = i;
DDUMP(mini);
}
}
}
@ -121,6 +111,11 @@ void DiagramEditor::LeftDown(Point p, dword keyflags)
return;
}
}
if(sel.GetCount() == 1 && !(keyflags & K_CTRL)) {
sel.Clear();
cursor = -1;
}
int i = FindItem(p);
if(i >= 0) {
@ -134,8 +129,10 @@ void DiagramEditor::LeftDown(Point p, dword keyflags)
}
}
else {
sel.Clear();
SetCursor(-1);
if(!(keyflags & K_CTRL)) {
sel.Clear();
SetCursor(-1);
}
doselection = true;
}
@ -196,16 +193,8 @@ void DiagramEditor::LeftUp(Point p, dword keyflags)
Sync();
doselection = false;
Commit();
if(Distance(dragstart, p) < 2) {
if((keyflags & K_CTRL) == 0) {
sel.Clear();
SetCursor(cursor);
}
if(CursorItem().IsTextClick(p)) {
StartText();
return;
}
}
if(Distance(dragstart, p) < 2 && CursorItem().IsTextClick(p))
StartText();
}
void DiagramEditor::RightDown(Point p, dword keyflags)