mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-05-21 06:45:39 -06:00
ide: LayDes ctrl scrolling remove (it intefered with normal use of ctrl)
This commit is contained in:
parent
f303c88216
commit
1c87236c19
2 changed files with 5 additions and 30 deletions
|
|
@ -357,8 +357,6 @@ private:
|
|||
};
|
||||
|
||||
int Zoom = 0;
|
||||
Point scroll_start = Null;
|
||||
Point scroll_base;
|
||||
|
||||
Rect CtrlRect(Ctrl::LogPos pos, Size sz);
|
||||
Rect CtrlRectZ(Ctrl::LogPos pos, Size sz);
|
||||
|
|
|
|||
|
|
@ -401,8 +401,6 @@ int LayDes::FindItem(Point p, bool cursor_first)
|
|||
|
||||
Image LayDes::CursorImage(Point p, dword keyflags)
|
||||
{
|
||||
if(keyflags & K_CTRL)
|
||||
return IsNull(scroll_start) ? IconDesImg::MoveCursor() : IconDesImg::MoveMove();
|
||||
int hi;
|
||||
if(HasCapture())
|
||||
hi = draghandle;
|
||||
|
|
@ -614,18 +612,9 @@ void LayDes::LeftDown(Point p, dword keyflags)
|
|||
SetCapture();
|
||||
LayoutData& l = CurrentLayout();
|
||||
draglayoutsize = l.size;
|
||||
|
||||
if(keyflags & K_CTRL) {
|
||||
scroll_start = p;
|
||||
scroll_base = sb;
|
||||
return;
|
||||
}
|
||||
|
||||
p = Normalize(p);
|
||||
|
||||
draghandle = FindHandle(p);
|
||||
dragbase = ZPoint(p);
|
||||
|
||||
if(draghandle >= 0)
|
||||
StoreItemRects();
|
||||
else {
|
||||
|
|
@ -685,16 +674,8 @@ void LayDes::MouseMove(Point p, dword keyflags)
|
|||
{
|
||||
if(!HasCapture() || IsNull(currentlayout))
|
||||
return;
|
||||
|
||||
if(!IsNull(scroll_start)) {
|
||||
sb = scroll_base + scroll_start - p;
|
||||
return;
|
||||
}
|
||||
|
||||
Point pz = Normalize(p);
|
||||
|
||||
p = ZPoint(pz);
|
||||
|
||||
LayoutData& l = CurrentLayout();
|
||||
bool smallmove = max(abs(p.x - dragbase.x), abs(p.y - dragbase.y)) < 4;
|
||||
if(draghandle == 14) {
|
||||
|
|
@ -799,10 +780,6 @@ void LayDes::MouseMove(Point p, dword keyflags)
|
|||
|
||||
void LayDes::LeftUp(Point p, dword keyflags)
|
||||
{
|
||||
if(!IsNull(scroll_start)) {
|
||||
scroll_start = Null;
|
||||
return;
|
||||
}
|
||||
if(draghandle == 11 && (keyflags & (K_SHIFT|K_CTRL)) == 0)
|
||||
SelectOne(FindItem(ZPoint(Normalize(p))), 0);
|
||||
draghandle = -1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue