From 21ae7ad80e18a4c8e11435e14be780115794f4db Mon Sep 17 00:00:00 2001 From: mdelfede Date: Tue, 8 Jul 2008 21:49:02 +0000 Subject: [PATCH] new uvs2 releases : uppsrc-2621 tutorial-38 examples-142 reference-115 git-svn-id: svn://ultimatepp.org/upp/trunk@309 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Draw/ImageBlit.cpp | 4 ++-- uppsrc/RichEdit/Editor.cpp | 2 +- uppsrc/RichEdit/Mouse.cpp | 8 ++++---- uppsrc/ide/Install.cpp | 8 ++++---- uppsrc/ide/ide.h | 6 +++--- uppsrc/ide/ide.lay | 1 + uppsrc/ide/ide.upp | 1 + uppsrc/ide/idewin.cpp | 2 +- 8 files changed, 17 insertions(+), 15 deletions(-) diff --git a/uppsrc/Draw/ImageBlit.cpp b/uppsrc/Draw/ImageBlit.cpp index b1cbe897a..ebea712fa 100644 --- a/uppsrc/Draw/ImageBlit.cpp +++ b/uppsrc/Draw/ImageBlit.cpp @@ -111,7 +111,7 @@ int Premultiply(RGBA *t, const RGBA *s, int len) if(s->a != 255) { while(s < e) { byte a = s->a; - if(s->a != 0 || s->a != 255) { + if(s->a != 0 && s->a != 255) { while(s < e) { int alpha = s->a + (s->a >> 7); t->r = alpha * (s->r) >> 8; @@ -155,7 +155,7 @@ int Unmultiply(RGBA *t, const RGBA *s, int len) if(s->a != 255) { while(s < e) { byte a = s->a; - if(s->a != 0 || s->a != 255) { + if(s->a != 0 && s->a != 255) { while(s < e) { int alpha = um_table__[s->a]; t->r = (alpha * s->r) >> 8; diff --git a/uppsrc/RichEdit/Editor.cpp b/uppsrc/RichEdit/Editor.cpp index 45ee5cc2f..ecf4d4e36 100644 --- a/uppsrc/RichEdit/Editor.cpp +++ b/uppsrc/RichEdit/Editor.cpp @@ -309,7 +309,7 @@ int RichEdit::GetX(int x) int RichEdit::GetSnapX(int x) { - return (GetX(x) + GetTextRect().left) / 32 * 32; + return GetX(x) / 32 * 32; } void RichEdit::GetPagePoint(Point p, PageY& py, int& x) diff --git a/uppsrc/RichEdit/Mouse.cpp b/uppsrc/RichEdit/Mouse.cpp index f613f7ca6..d8d5ef2db 100644 --- a/uppsrc/RichEdit/Mouse.cpp +++ b/uppsrc/RichEdit/Mouse.cpp @@ -44,7 +44,7 @@ void RichEdit::SetObjectYDelta(int pt) void RichEdit::SetObjectPos(int pos) { Rect r = GetObjectRect(cursor); - Rect rr = r.Offseted(16, -sb); + Rect rr = r.Offseted(GetTextRect().left, -sb); objectrect = GetObjectRect(pos); objectpos = cursor; PageRect pr = text.GetCaret(cursor, pagesz); @@ -95,7 +95,7 @@ void RichEdit::LeftDown(Point p, dword flags) Size sz = obj.GetSize(); sz.cx = int(zoom * sz.cx + 0.5); sz.cy = int(zoom * sz.cy + 0.5); - sz = tracker.Track(Rect(objectrect.Offseted(16, -sb).TopLeft(), sz), tx, ty).Size(); + sz = tracker.Track(Rect(objectrect.Offseted(GetTextRect().left, -sb).TopLeft(), sz), tx, ty).Size(); sz.cx = int(sz.cx / zoom + 0.5); sz.cy = int(sz.cy / zoom + 0.5); obj.SetSize(sz); @@ -111,7 +111,7 @@ void RichEdit::LeftDown(Point p, dword flags) Move(c, flags & K_SHIFT); mpos = c; SetCapture(); - if(cursorp.object && GetObjectRect(cursor).Offseted(16, -sb).Contains(p)) + if(cursorp.object && GetObjectRect(cursor).Offseted(GetTextRect().left, -sb).Contains(p)) SetObjectPos(cursor); } } @@ -173,7 +173,7 @@ void RichEdit::MouseMove(Point p, dword flags) if(py > text.GetHeight(pagesz)) c = GetLength() + 1; else - c = GetNearestPos((p.x - 16) / GetZoom(), py); + c = GetNearestPos(GetX(p.x), py); if(c != mpos) { mpos = -1; Move(c, true); diff --git a/uppsrc/ide/Install.cpp b/uppsrc/ide/Install.cpp index 6ef6564fa..e2f1783f8 100644 --- a/uppsrc/ide/Install.cpp +++ b/uppsrc/ide/Install.cpp @@ -267,11 +267,11 @@ String DefaultInstallFolder() DefaultFolder = "upp-svn"; else if(ExeTitle.Find("DEV") >= 0) DefaultFolder = "upp-dev"; - else if(ExeTitle.Find("BETA") >= 0) + else if(ExeTitle.Find("BETA") >= 0) DefaultFolder = "upp-beta"; else DefaultFolder = "upp"; - + return DefaultFolder; } @@ -335,9 +335,9 @@ bool Install() Progress pi; if(dlg.Run() != IDOK) return true; String upp(dlg.path); - + SaveFile(ConfigFile("installpath"), upp); - + String uppsrc; String pp; String out = AppendFileName(upp, "out"); diff --git a/uppsrc/ide/ide.h b/uppsrc/ide/ide.h index e2f727347..eabbe7725 100644 --- a/uppsrc/ide/ide.h +++ b/uppsrc/ide/ide.h @@ -409,7 +409,7 @@ struct AssistEditor : CodeEditor { String IdBack(int& qq); void SwapSContext(Parser& p); - + void CreateIndex(); void SyncIndex(); @@ -420,7 +420,7 @@ struct AssistEditor : CodeEditor { bool IndexKey(dword key); bool IsIndex(); void ShowIndex(bool b); - + void SerializeIndex(Stream& s); typedef AssistEditor CLASSNAME; @@ -704,7 +704,7 @@ public: TopicCtrl doc; int state_icon; - + String export_name; String export_outdir; bool export_usedonly; diff --git a/uppsrc/ide/ide.lay b/uppsrc/ide/ide.lay index 79fc781e9..870af9046 100644 --- a/uppsrc/ide/ide.lay +++ b/uppsrc/ide/ide.lay @@ -542,3 +542,4 @@ LAYOUT(ExportLayout, 400, 116) ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(260, 64).TopPosZ(84, 24)) ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(328, 64).TopPosZ(84, 24)) END_LAYOUT + diff --git a/uppsrc/ide/ide.upp b/uppsrc/ide/ide.upp index 7b7592754..f18a803fa 100644 --- a/uppsrc/ide/ide.upp +++ b/uppsrc/ide/ide.upp @@ -82,3 +82,4 @@ mainconfig custom() "", "", "$(OUTDIR)/$(FILE).obj"; + diff --git a/uppsrc/ide/idewin.cpp b/uppsrc/ide/idewin.cpp index 54b515672..e5cf14ea6 100644 --- a/uppsrc/ide/idewin.cpp +++ b/uppsrc/ide/idewin.cpp @@ -610,7 +610,7 @@ Ide::Ide() doc_serial = -1; showtime = true; - + export_outdir = GetHomeDirFile("export++"); export_usedonly = true; }