github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-29 06:12:18 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

*RichText: Fixed Image typesetting/caching issue

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@2167 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2010-03-03 16:07:56 +00:00
parent d9b4bae44c
commit 6bae09a746
5 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Core/Value.h
View file

@ -133,7 +133,7 @@ protected:
public:
static void Register(dword w, Void* (*c)(Stream& s)) init_;
dword GetType() const { return ptr->GetType(); }
bool IsError() const { return GetType() == ERROR_V; }
bool IsVoid() const { return GetType() == VOID_V || IsError(); }

1
uppsrc/CtrlLib/TabCtrl.cpp
View file

@ -312,6 +312,7 @@ int TabCtrl::Find(const Ctrl& slave) const
for(int i = 0; i < tab.GetCount(); i++)
if(tab[i].slave == &slave)
return i;
return -1;
}
void TabCtrl::Set(Ctrl& slave)

1
uppsrc/RichText/Para.h
View file

@ -195,6 +195,7 @@ struct RichPara {
Buffer<const CharFormat *> format;
Array<Line> line;
Array<CharFormat> hformat;
Array<RichObject> object;
int first_indent;
int next_indent;

3
uppsrc/RichText/ParaType.cpp
View file

@ -100,7 +100,8 @@ void RichPara::StorePart::Store(Lines& lines, const Part& part, int pinc)
h->ascent = sz.cy - h->ydelta;
h->descent = max(h->ydelta, 0);
h->external = 0;
h->object = &part.object;
lines.object.Add(part.object);
h->object = &lines.object.Top();
h++;
*t++ = 'x';
*p++ = pos;

2
uppsrc/RichText/RichText.h
View file

@ -180,7 +180,7 @@ public:
static int FindType(const String& name) { return Map().Find(name); }
static RichObjectType& GetType(int i) { return *Map()[i]; }
static String GetTypeName(int i) { return Map().GetKey(i); }
void SetSize(int cx, int cy) { size = Size(cx, cy); NewSerial(); }
void SetSize(Size sz) { size = sz; NewSerial(); }
Size GetSize() const { return size; }