mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-07-19 14:16:46 -06:00
RichEdit now shows an arrow to signal labeled paragraphs
git-svn-id: svn://ultimatepp.org/upp/trunk@1686 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl
parent
26d92c089f
commit
7511ec014c
6 changed files with 30 additions and 21 deletions
|
|
@ -105,24 +105,24 @@ IMAGE_ID(SortUp)
|
|||
IMAGE_ID(SortDown)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,237,154,11,110,196,32,12,68,125,148,189,64,165,30,49,71,203,205,82,209,124,74,89,2,54,193,216,180,51,146)
|
||||
IMAGE_DATA(165,86,221,45,111,50,94,2,100,233,69,47,130,222,180,57,24,223,146,97,35,91,134,141,108,25,210,241,71,51,228,198)
|
||||
IMAGE_DATA(31,201,112,55,254,40,134,210,248,35,24,188,228,159,254,60,114,252,148,197,195,124,244,95,199,135,32,8,130,32,8,210)
|
||||
IMAGE_DATA(209,39,125,88,35,64,16,228,88,203,66,219,89,214,44,82,5,230,109,219,107,93,215,169,54,117,49,123,234,97,89,22)
|
||||
IMAGE_DATA(247,62,114,252,161,232,224,247,236,225,142,61,205,192,171,135,18,191,247,12,106,236,222,51,224,240,123,205,128,203,238,53)
|
||||
IMAGE_DATA(131,148,63,154,243,191,43,252,238,53,131,220,181,167,204,193,180,215,12,90,248,189,100,80,186,87,213,248,61,100,240,132)
|
||||
IMAGE_DATA(223,58,131,210,156,195,229,183,204,160,196,127,172,153,175,170,121,29,205,95,155,239,107,243,167,117,6,156,251,21,85,122)
|
||||
IMAGE_DATA(199,42,3,238,189,246,236,33,111,235,34,46,255,201,84,234,157,209,25,72,214,57,39,19,247,181,35,50,144,242,75,75)
|
||||
IMAGE_DATA(147,95,202,30,207,65,220,30,210,204,160,165,119,72,48,7,105,102,208,210,55,173,252,26,25,180,240,183,244,143,86,6)
|
||||
IMAGE_DATA(218,159,219,18,127,15,15,35,249,211,254,153,41,131,28,123,239,207,49,101,214,198,61,43,101,215,185,23,188,143,161,85)
|
||||
IMAGE_DATA(189,217,71,122,208,98,135,32,8,130,254,128,240,101,14,8,130,114,154,113,129,25,243,237,27,247,188,194,223,60,121,225)
|
||||
IMAGE_DATA(48,115,188,88,177,183,112,223,249,24,205,94,99,10,231,87,113,213,188,210,190,25,54,103,223,89,242,85,127,159,174,7)
|
||||
IMAGE_DATA(14,251,19,126,77,15,146,126,111,233,159,223,239,237,239,129,123,237,123,136,142,67,161,158,236,61,230,26,174,122,127,121)
|
||||
IMAGE_DATA(78,114,237,239,122,159,219,255,63,255,199,134,191,228,163,133,191,207,97,52,248,193,255,140,95,58,255,60,225,215,121,32)
|
||||
IMAGE_DATA(38,203,224,9,127,204,222,147,95,146,65,43,191,214,195,164,211,67,11,183,196,135,22,123,36,222,133,108,80,202,174,184)
|
||||
IMAGE_DATA(47,152,153,253,242,208,107,255,101,192,126,121,104,245,17,63,172,183,60,163,56,198,187,170,118,254,16,191,214,203,249,74)
|
||||
IMAGE_DATA(50,254,173,151,59,102,111,231,41,177,23,14,191,53,119,78,53,126,107,62,129,102,231,15,154,157,63,104,118,254,116,158)
|
||||
IMAGE_DATA(154,82,179,243,67,16,4,65,62,244,5,160,162,162,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_DATA(120,156,237,154,11,110,196,32,12,68,125,148,189,64,165,30,49,71,219,155,165,162,249,148,82,2,54,193,216,52,51,146)
|
||||
IMAGE_DATA(165,86,221,45,111,50,94,2,100,233,69,47,138,180,146,189,172,25,86,67,134,53,169,39,50,164,227,143,102,200,141,255)
|
||||
IMAGE_DATA(52,134,171,241,71,49,148,198,31,193,224,37,255,244,231,145,227,167,44,150,243,242,211,199,135,32,8,130,32,8,210,209)
|
||||
IMAGE_DATA(39,125,88,35,64,16,228,88,203,66,235,81,214,44,82,5,230,117,221,234,253,126,79,181,169,139,217,83,15,203,178,184)
|
||||
IMAGE_DATA(247,145,227,15,69,59,191,103,15,87,236,105,6,94,61,148,248,189,103,80,99,247,158,1,135,223,107,6,92,118,175,25)
|
||||
IMAGE_DATA(164,252,209,156,255,93,225,119,175,25,228,174,61,101,14,166,189,102,208,194,239,37,131,210,189,170,198,239,33,131,59,252)
|
||||
IMAGE_DATA(214,25,148,230,28,46,191,101,6,37,254,125,205,124,86,205,235,104,254,218,124,95,155,63,173,51,224,220,175,168,210,59)
|
||||
IMAGE_DATA(86,25,112,239,181,71,15,121,91,23,113,249,15,166,82,239,140,206,64,178,206,57,152,184,175,29,145,129,148,95,90,154)
|
||||
IMAGE_DATA(252,82,246,120,14,226,246,144,102,6,45,189,67,130,57,72,51,131,150,190,105,229,215,200,160,133,191,165,127,180,50,208)
|
||||
IMAGE_DATA(254,220,150,248,123,120,24,201,159,246,207,76,25,228,216,123,127,142,41,179,54,238,89,41,187,206,189,224,239,24,90,213)
|
||||
IMAGE_DATA(155,125,164,7,45,118,8,130,32,232,31,8,95,230,128,32,40,167,25,23,152,49,223,182,113,207,43,252,205,147,23,14)
|
||||
IMAGE_DATA(51,199,139,21,123,11,247,149,143,209,236,53,166,112,126,21,87,205,43,109,155,97,115,246,141,37,95,245,247,233,122,224)
|
||||
IMAGE_DATA(176,223,225,215,244,32,233,247,150,254,249,253,222,254,30,184,215,190,135,104,63,20,234,201,222,99,174,225,170,247,151,231)
|
||||
IMAGE_DATA(36,215,254,170,247,185,253,255,243,127,108,248,75,62,90,248,251,28,70,131,31,252,247,248,165,243,207,29,126,157,7,98)
|
||||
IMAGE_DATA(178,12,238,240,199,236,61,249,37,25,180,242,107,61,76,58,60,180,112,75,124,104,177,71,226,93,200,6,165,236,138,251)
|
||||
IMAGE_DATA(130,153,217,79,15,189,246,95,6,236,167,135,86,31,241,195,122,203,51,138,125,188,179,106,231,15,241,107,189,156,175,36)
|
||||
IMAGE_DATA(227,95,122,185,98,246,118,158,18,123,225,240,91,115,231,84,227,183,230,19,104,118,254,160,217,249,131,102,231,79,231,169)
|
||||
IMAGE_DATA(41,53,59,63,4,65,16,228,67,95,214,84,170,141,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_END_DATA(576, 3)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
|
|
|
|||
|
|
@ -118,6 +118,7 @@ void RichEdit::Paint(Draw& w)
|
|||
pi.usecache = true;
|
||||
pi.sizetracking = sizetracking;
|
||||
pi.showcodes = showcodes;
|
||||
pi.showlabels = !IsNull(showcodes);
|
||||
if(spellcheck)
|
||||
pi.spellingchecker = SpellParagraph;
|
||||
if(IsSelection())
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ PaintInfo::PaintInfo()
|
|||
indexentry = LtGreen();
|
||||
coloroverride = false;
|
||||
context = NULL;
|
||||
showlabels = false;
|
||||
}
|
||||
|
||||
String RichPara::Number::AsText(const RichPara::NumberFormat& format) const
|
||||
|
|
|
|||
|
|
@ -193,6 +193,9 @@ void RichPara::Paint(PageDraw& pw, const Rect& page, PageY py, const PaintInfo&
|
|||
if(py > pi.bottom)
|
||||
break;
|
||||
|
||||
if(lni == 0 && format.label.GetCount() && !IsNull(pi.showcodes) && pi.showlabels)
|
||||
pw.Page(py.page).DrawImage(z * page.left - 12, z * (py.y + (lineascent - 7) / 2),
|
||||
RichTextImg::Label(), pi.showcodes);
|
||||
const CharFormat **cf = pl.format + li.pos;
|
||||
const CharFormat **i = cf;
|
||||
const CharFormat **ilim = i + li.len;
|
||||
|
|
|
|||
|
|
@ -270,6 +270,7 @@ struct PaintInfo {
|
|||
Color highlight;
|
||||
bool coloroverride;
|
||||
void *context;
|
||||
bool showlabels;
|
||||
|
||||
PaintInfo();
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
PREMULTIPLIED
|
||||
IMAGE_ID(Label)
|
||||
IMAGE_ID(EndParaChar)
|
||||
IMAGE_ID(TabChar)
|
||||
IMAGE_ID(SpaceChar)
|
||||
IMAGE_ID(HardSpaceChar)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,99,96,101,224,96,192,3,254,147,33,246,31,11,141,206,70,199,232,234,176,155,205,198,192,74,138,67,73,177,28)
|
||||
IMAGE_DATA(155,122,236,230,51,1,157,129,199,34,92,6,64,0,11,225,224,198,101,16,46,62,97,75,113,0,0,165,164,44,1,0)
|
||||
IMAGE_END_DATA(64, 4)
|
||||
IMAGE_DATA(120,156,149,146,141,6,0,32,16,131,39,253,189,255,11,95,81,148,108,93,141,115,204,217,62,9,9,5,155,108,14,243)
|
||||
IMAGE_DATA(76,120,38,60,54,94,222,82,66,197,69,39,228,139,103,100,123,240,28,238,204,206,29,247,3,244,167,156,221,243,252,208)
|
||||
IMAGE_DATA(49,46,69,42,96,40,250,207,173,130,188,191,161,75,133,26,171,20,66,246,0,0,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_END_DATA(96, 5)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue