From 7ed7cce801cd674d2bd39488fe2afc22da1ea70c Mon Sep 17 00:00:00 2001 From: cxl Date: Wed, 8 Jul 2015 07:13:42 +0000 Subject: [PATCH] ide: IconDes fixes #1160, #1156, #1161 git-svn-id: svn://ultimatepp.org/upp/trunk@8648 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/IconDes/Event.cpp | 1 + uppsrc/IconDes/Paint.cpp | 6 +- uppsrc/ide/icon.ico | Bin 2862 -> 2862 bytes uppsrc/ide/ide.iml | 7618 +++++++++++++++++++------------------- 4 files changed, 3798 insertions(+), 3827 deletions(-) diff --git a/uppsrc/IconDes/Event.cpp b/uppsrc/IconDes/Event.cpp index 7d73e8cd2..69d6ce943 100644 --- a/uppsrc/IconDes/Event.cpp +++ b/uppsrc/IconDes/Event.cpp @@ -4,6 +4,7 @@ NAMESPACE_UPP void IconDes::LeftDown(Point p, dword flags) { + SetFocus(); if(!IsCurrent()) return; SaveUndo(); diff --git a/uppsrc/IconDes/Paint.cpp b/uppsrc/IconDes/Paint.cpp index 8a6cc6f4f..4b8501347 100644 --- a/uppsrc/IconDes/Paint.cpp +++ b/uppsrc/IconDes/Paint.cpp @@ -74,9 +74,13 @@ void IconDes::Paint(Draw& w) } } w.DrawImage(-spos.x, -spos.y, pb); + Rect r = pb.GetSize(); + r.Offset(-spos); + w.DrawRect(r.right, 0, 1, r.bottom + 1, LtRed()); + w.DrawRect(0, r.bottom, r.right, 1, LtRed()); m1refresh = Null; if(IsPasting() && IsPasting()) - DrawFrame(w, Rect(spos, Current().paste_image.GetSize()), LtRed); + DrawFrame(w, Rect(Current().pastepos - spos, Current().paste_image.GetSize()), LtRed); return; } Point hotspot = image.GetHotSpot(); diff --git a/uppsrc/ide/icon.ico b/uppsrc/ide/icon.ico index 0ceca6eb05fed53a9cd0e5b5ebe844f3fb447af1..4cff9502574c41f1a9581c6a4b36e1faac662d5c 100644 GIT binary patch literal 2862 zcmeHJF;2uV5ZuJEV^P5iKr~#5bcmV)cmUG90D-6}pgoBKI)1=gQqa)z93(Tdj-8yj zLnnbK(5?kwy51SBF9+e+={%Qmhwp@;(h0t}K`Wjk_o6qNgPCWTZgZa3(WRO4uBRaWU^%}ZADoMNG>wby>KEB1#TZX8^Os;o zBXG`qV!ck0qrc+(sk5BVpOCtI-!=Fu(&OVfkQ@2z<+B-29@qWM@vOKXv4h4?*IB;u z%gPtM67U;2-|S;oq%(uhafg&X?sH8Jxr_IV*O5-ZFU{ADJU={&4~@LPzKO4cv=9iW z2h@1v=eJiI-<-kbKkyI#1Lb|NB6kLNOK+yC#5p4fYTjCDofA8{UfR}WxB<6rTVaGD zAg>p5Ti2`r* literal 2862 zcmdT`v2N5r5FLBH=Up1Y7X+b5qynTvlvWD(0VIDx0C7^P6rnvSMd?K5dn#j=4NMh-rKk1lVzfU6dfFp*vE?K6|Z8hiN10zH*O) zde|Sc7xGJV!hQeH9G{i@-0^v@U^bQuYjHN92O0JcpKj8n6!zU_*bJ@6(XpcWS*)!xS#m|E2~!=Wxzk zoX~*h5}wi0nExNrXS;N5msz7!Y*a;In?_j