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

.CtrlLib, CtrlCore, Painter, RichEdit: minor fixes

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3629 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2011-07-09 19:33:20 +00:00
parent 931bf5b92f
commit 79cdbbe6dd
9 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Core/Diag.h
View file

@ -246,4 +246,4 @@ void DumpMap(Stream& s, const T& t) {
s << LOG_END;
}
String AsString(MemoryProfile& mem);
String AsString(const MemoryProfile& mem);

2
uppsrc/Core/Log.cpp
View file

@ -269,7 +269,7 @@ static void sLarge(String& text, size_t *large, int count, const char *txt)
}
}
String AsString(MemoryProfile& mem)
String AsString(const MemoryProfile& mem)
{
String text;
int acount = 0;

2
uppsrc/CtrlCore/CtrlCore.h
View file

@ -1397,7 +1397,7 @@ public:
};
void DrawDragRect(Ctrl& q, const Rect& rect1, const Rect& rect2, const Rect& clip, int n,
Color color, const word *pattern);
Color color, uint64 pattern);
bool PointLoop(Ctrl& ctrl, const Vector<Image>& ani, int ani_ms);
bool PointLoop(Ctrl& ctrl, const Image& img);

2
uppsrc/CtrlLib/Button.cpp
View file

@ -144,7 +144,7 @@ Pusher& Pusher::ClickFocus(bool cf)
return *this;
}
String Pusher::GetDesc()
String Pusher::GetDesc() const
{
return label;
}

4
uppsrc/CtrlLib/CtrlUtil.cpp
View file

@ -207,7 +207,7 @@ void Get(ArrayCtrl& array, int ii, IdCtrls& m)
m[i] <<= array.Get(ii, m(i));
}
String sProfile(MemoryProfile& mem)
String sProfile(const MemoryProfile& mem)
{
return AsString(mem);
}
@ -217,7 +217,7 @@ void MemoryProfileInfo() {
String text = sProfile(mem);
const MemoryProfile *peak = PeakMemoryProfile();
if(peak)
text << "\r\n=== Peak memory profile\r\n" << sProfile(mem);
text << "\r\n=== Peak memory profile\r\n" << sProfile(*peak);
PromptOK("[C " + DeQtfLf(text));
};

2
uppsrc/CtrlLib/PushCtrl.h
View file

@ -9,7 +9,7 @@ public:
virtual void GotFocus();
virtual void LostFocus();
virtual void State(int);
virtual String GetDesc();
virtual String GetDesc() const;
virtual bool Key(dword key, int);
virtual bool HotKey(dword key);
virtual dword GetAccessKeys() const;

5
uppsrc/Painter/Fillers.cpp
View file

@ -43,7 +43,7 @@ inline RGBA InvertRGBA(const RGBA& c)
a.r = ~c.r;
a.g = ~c.g;
a.b = ~c.b;
a.a = c.a;
a.a = 255;
return a;
}
@ -72,7 +72,7 @@ void SolidFiller::Render(int val, int len)
}
else
while(t < e) {
AlphaBlend(*t, Mul8(InvertRGBA(*t), val));
AlphaBlendCover8(*t, InvertRGBA(*t), val);
t++;
}
}
@ -411,6 +411,7 @@ void ClipFiller::Finish(ClippingLine& cl)
x += n;
full = false;
}
ASSERT(t - ~buffer <= 2 * cx);
if(full)
cl.SetFull();
else

2
uppsrc/RichEdit/Mouse.cpp
View file

@ -79,7 +79,7 @@ void RichEdit::LeftDown(Point p, dword flags)
int tx, ty;
switch(c) {
case 1:
tracker.SetCursorImage(Image::SizeHorz());
tracker.SetCursorImage(Image::SizeVert());
tx = ALIGN_CENTER; ty = ALIGN_BOTTOM;
break;
case 2:

6
uppsrc/RichEdit/RichEdit.t
View file

@ -2173,7 +2173,7 @@ zhTW("Allow orphans")
T_("Ruler")
caES("Regle")
csCZ("Prav\303\255tko")
csCZ("\304\214\303\241ra p\305\231ed")
deDE("")
esES("Regla")
fiFI("")
@ -2192,7 +2192,7 @@ zhTW("\351\207\217\345\260\272")
T_("Ruler height")
caES("Al\303\247ada de regla")
csCZ("V\303\275\305\241ka prav\303\255tka")
csCZ("V\303\275\305\241ka \304\215\303\241ry")
deDE("")
esES("Altura de regla")
fiFI("")
@ -2212,7 +2212,7 @@ zhTW("\351\207\217\345\260\272\351\253\230\345\272\246")
T_("Ink")
caES("Tinta")
csCZ("Text")
csCZ("Barva")
deDE("Textfarbe")
esES("Tinta")
fiFI("Muste")