From ac817c19bc40b0b305e16c17902afdf560839231 Mon Sep 17 00:00:00 2001 From: cxl Date: Tue, 9 Sep 2008 14:52:30 +0000 Subject: [PATCH] More Size_ fixes git-svn-id: svn://ultimatepp.org/upp/trunk@418 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/src.tpp/Size$en-us.tpp | 63 ++--- uppsrc/CtrlCore/src.tpp/Frame$en-us.tpp | 341 +++++++++++++++++++++-- uppsrc/CtrlCore/src.tpp/Layout$en-us.tpp | 81 +++++- uppsrc/RichText/EncodeQtf.cpp | 2 +- 4 files changed, 431 insertions(+), 56 deletions(-) diff --git a/uppsrc/Core/src.tpp/Size$en-us.tpp b/uppsrc/Core/src.tpp/Size$en-us.tpp index e92c1a35c..800842754 100644 --- a/uppsrc/Core/src.tpp/Size$en-us.tpp +++ b/uppsrc/Core/src.tpp/Size$en-us.tpp @@ -4,38 +4,38 @@ topic "Size";[ $$0,0#00000000000000000000000000000000:Default] [i448;H4;b50;a25;kKO9;*@(64)2 $$3,0#37138531426314131252341829483370:item] [~~~=_8333; $$4,4#05600065144404261032431302351956:break] [l288;a25;kK~~~.1408;@3;2 $$5,0#61217621437177404841962893300719:param] -[i448;a25;kO9;*@(64)2 $$6,6#46142A79FADFFD11679EC28E167BF415:item`_next] +[i448;a25;kO9;*@(64)2 $$6,6#46142079503553116794228416715415:item`_next] [{_}%EN-US [s0; Upp&] [s0; Size`_&] [s0;*@(154.0.0)+109 &] -[s1;K:`:`:Size`_`:`:struct: template_<[@(0.0.255) class]_[@4 T]>&] +[s1;K:`:`:Size`_`:`:struct: [@(0.0.255) template]_<[@(0.0.255) class]_[@4 T]>&] [s1;K:`:`:Size`_`:`:struct: [@(0.0.255) struct]_[@0 Size`_]_:_[@(0.0.255) public]_[^topic`:`/`/Core`/srcdoc`/Moveable`$en`-us^ M oveable]<_[@0 Size`_]<[@4 T]>_>_&] [s2; &] [s0; [* Size`_] is a generic structure that describes a two dimensional size object. The horizontal dimension is represented by [*@(154.0.0) cx][@(154.0.0) ]and the vertical one by [*@(154.0.0) cy]. Both dimension are of -type [@4 T]. To get a specialized version of [* Size`_], use one +type [*@4 T]. To get a specialized version of [* Size`_], use one of the following:&] [s0; &] -[s3; Size&] -[s6; [@(64) typedef_][^`:`:Size`_^@(64) Size`_][@(64) <][@(0.0.255) int][@(64) >_]Size&] +[s3; [@3 Size]&] +[s6; [@(0.0.255) typedef]_[^`:`:Size`_^ Size`_]<[@(0.0.255) int]>_Size&] [s2; Size`_ with with [* int] dimensions.&] [s0;*@(154.0.0)2 &] -[s3; Size16&] -[s6;:`:`:Size16`:`:typedef: [@(64) typedef_][^`:`:Size`_^@(64) Size`_][@(64) <][@(0.0.255) in -t16][@(64) >_]Size16&] +[s3; [@3 Size16]&] +[s6;:`:`:Size16`:`:typedef: [@(0.0.255) typedef]_[^`:`:Size`_^ Size`_]<[@(0.0.255) int16]>_ +Size16&] [s2; Size`_ with with [* int16][@(0.0.255) ]dimensions.&] [s0;*@(154.0.0)2 &] -[s3; Size64&] -[s6;:`:`:Size64`:`:typedef: [@(64) typedef_][^`:`:Size`_^@(64) Size`_][@(64) <][@(0.0.255) in -t64][@(64) >_]Size64&] +[s3; [@3 Size64]&] +[s6;:`:`:Size64`:`:typedef: [@(0.0.255) typedef]_[^`:`:Size`_^ Size`_]<[@(0.0.255) int64]>_ +Size64&] [s2; Size`_ with with [* int64][@(0.0.255) ]dimensions.&] [s0;*@(154.0.0)2 &] -[s3; Sizef&] -[s6;:`:`:Sizef`:`:typedef: [@(64) typedef_][^`:`:Size`_^@(64) Size`_][@(64) <][@(0.0.255) dou -ble][@(64) >_]Sizef&] +[s3; [@3 Sizef]&] +[s6;:`:`:Sizef`:`:typedef: [@(0.0.255) typedef]_[^`:`:Size`_^ Size`_]<[@(0.0.255) double]>_ +Sizef&] [s2; Size`_ with with [* double][@(0.0.255) ]dimensions.&] [s0; &] [s0; &] @@ -50,7 +50,7 @@ alue]`&_[@3 src])&] [s4; &] [s3;K:`:`:Size`_`:`:`:`:Size`_`(T`,T`): [@0 Size`_]([@4 T]_[@3 cx], [@4 T]_[@3 cy])&] [s5; Creates a [* Size`_] object an initializes it`'s horizontal dimension -with [%-@3;3 cx][%- and it`'s vertical dimension with ][*@3 cy].&] +with [%-3 cx][%- and it`'s vertical dimension with ][* cy].&] [s4; &] [s3;K:`:`:Size`_`:`:`:`:Size`_`(const`:`:Size`_``&`): [@0 Size`_]([@(0.0.255) const ]_[@0 Size`_]<[@(0.0.255) int]>`&_[@3 sz])&] @@ -82,10 +82,10 @@ uller]`&)&] [s0; &] [ {{10000F(128)G(128)@1 [s0; Public Field Detail]}}&] [s0; &] -[s3;K:`:`:Size`_`:`:cx:%- [@4 T][@(64) _]cx&] +[s3;K:`:`:Size`_`:`:cx:%- [@4 T]_[@0 cx]&] [s2; the horizontal dimension&] [s0; &] -[s3;K:`:`:Size`_`:`:cy:%- [@4 T][@(64) _]cy&] +[s3;K:`:`:Size`_`:`:cy:%- [@4 T]_[@0 cy]&] [s2; the vertical dimension&] [s0; &] [ {{10000F(128)G(128)@1 [s0; Method Detail]}}&] @@ -93,22 +93,22 @@ uller]`&)&] [s3;K:`:`:Size`_`:`:Clear`(`): [@(0.0.255) void]_[@0 Clear]()&] [s2; Sets both dimension to 0.&] [s4; &] -[s3;K:`:`:Size`_`:`:IsEmpty`(`)const: bool[@(64) _][@0 IsEmpty][@(64) ()_]const&] +[s3;K:`:`:Size`_`:`:IsEmpty`(`)const: [@(0.0.255) bool]_[@0 IsEmpty]()_[@(0.0.255) const]&] [s2; Returns [* true] if at least one dimension is 0, [* false] otherwise.&] [s4; &] [s3;K:`:`:Size`_`:`:SetNull`(`): [@(0.0.255) void]_[@0 SetNull]()&] [s2; Reinitializes the object to [* Null].&] [s4; &] -[s3;K:`:`:Size`_`:`:IsNullInstance`(`)const: bool[@(64) _][@0 IsNullInstance][@(64) ()_]con -st&] +[s3;K:`:`:Size`_`:`:IsNullInstance`(`)const: [@(0.0.255) bool]_[@0 IsNullInstance]()_[@(0.0.255) c +onst]&] [s2; Verifies if size is [* Null].&] [s4; &] -[s3;K:`:`:Size`_`:`:GetHashValue`(`)const: unsigned[@(64) _][@0 GetHashValue][@(64) ()_]con -st&] +[s3;K:`:`:Size`_`:`:GetHashValue`(`)const: [@(0.0.255) unsigned]_[@0 GetHashValue]()_[@(0.0.255) c +onst]&] [s2; Returns the hash value of the size.&] [s4; &] -[s3;K:`:`:Size`_`:`:ToString`(`)const: [^topic`:`/`/Core`/src`/String`$en`-us^@(64) Str -ing][@(64) _][@0 ToString][@(64) ()_]const&] +[s3;K:`:`:Size`_`:`:ToString`(`)const: [^topic`:`/`/Core`/src`/String`$en`-us^ String]_ +[@0 ToString]()_[@(0.0.255) const]&] [s2; Returns the [* String] representation of the size.&] [s4; &] [s3;K:`:`:Size`_`:`:operator`+`=`(`:`:Size`_`): [^`:`:Size`_^ Size`_]`&_[@0 operator`+`=]( @@ -124,7 +124,8 @@ ing][@(64) _][@0 ToString][@(64) ()_]const&] [s2; Decreases cx with [*@3 p]`'s horizontal dimension and cy with [*@3 p]`'s vertical dimension.&] [s4; &] -[s3;K:`:`:Size`_`:`:operator`-`=`(T`): [^`:`:Size`_^ Size`_]`&_[@0 operator`-`=](T_[@3 t])&] +[s3;K:`:`:Size`_`:`:operator`-`=`(T`): [^`:`:Size`_^ Size`_]`&_[@0 operator`-`=]([@4 T]_[@3 t +])&] [s2; Decreases both dimension with the same value [*@3 t].&] [s4; &] [s3;K:`:`:Size`_`:`:operator`*`=`(`:`:Size`_`): [^`:`:Size`_^ Size`_]`&_[@0 operator`*`=]( @@ -157,8 +158,8 @@ nt]_[@3 sh])&] [s3;K:`:`:Size`_`:`:operator`-`-`(`): [^`:`:Size`_^ Size`_]`&_[@0 operator`-`-]()&] [s2; Decrements both dimensions.&] [s4; &] -[s3;K:`:`:Size`_`:`:operator`:`:Value`(`)const: operator[@(64) _][@0 Value][@(64) ()_]const -&] +[s3;K:`:`:Size`_`:`:operator`:`:Value`(`)const: [@(0.0.255) operator]_[@0 Value]()_[@(0.0.255) c +onst]&] [s2; Returns a conversion of the size to [* Value].&] [s4; &] [s3;K:`:`:Size`_`:`:Serialize`(`:`:Stream`&`): [@(0.0.255) void]_[@0 Serialize]([^`:`:Stream^ S @@ -230,13 +231,13 @@ ool]_[@0 operator!`=]([^`:`:Size`_^ Size`_]_[@3 a], [^`:`:Size`_^ Size`_]_[@3 b] [s4; &] [s3;K:`:`:Size`_`:`:min`(`:`:Size`_`,`:`:Size`_`):%- [@(0.0.255) friend]_[^`:`:Size`_^ Si ze`_]_[@0 min]([^`:`:Size`_^ Size`_]_[@3 a], [^`:`:Size`_^ Size`_]_[@3 b])&] -[s2;%- [%%* Returns a ][%% Size`_ ][%%* with it`'s dimension equaling the -minimum of the respective dimension between ][@3 a ][* and][%%* ][@3 b].&] +[s2;%- [%% Returns a ][%%* Size`_][%% with it`'s dimension equaling the +minimum of the respective dimension between ][*@3 a][@3 ]and[%% ][*@3 b].&] [s0;%- &] [s3;K:`:`:Size`_`:`:max`(`:`:Size`_`,`:`:Size`_`):%- [@(0.0.255) friend]_[^`:`:Size`_^ Si ze`_]_[@0 max]([^`:`:Size`_^ Size`_]_[@3 a], [^`:`:Size`_^ Size`_]_[@3 b])&] -[s2;%- [%%* Returns a ][%% Size`_ ][%%* with it`'s dimension equaling the -maximum of the respective dimension between ][@3 a ][* and][%%* ][@3 b].&] +[s2;%- [%% Returns a ][%%* Size`_][%% with it`'s dimension equaling the +maximum of the respective dimension between ][*@3 a][@3 ]and[%% ][*@3 b].&] [s4; &] [s3;K:`:`:Size`_`:`:Nvl`(`:`:Size`_`,`:`:Size`_`):%- [@(0.0.255) friend]_[^`:`:Size`_^ Si ze`_]_[@0 Nvl]([^`:`:Size`_^ Size`_]_[@3 a], [^`:`:Size`_^ Size`_]_[@3 b])&] diff --git a/uppsrc/CtrlCore/src.tpp/Frame$en-us.tpp b/uppsrc/CtrlCore/src.tpp/Frame$en-us.tpp index dd9206bc2..aa4f9a900 100644 --- a/uppsrc/CtrlCore/src.tpp/Frame$en-us.tpp +++ b/uppsrc/CtrlCore/src.tpp/Frame$en-us.tpp @@ -1,18 +1,323 @@ -TITLE("Frame") -COMPRESSED -120,156,221,90,139,87,20,245,30,255,87,230,156,186,5,164,48,59,187,11,203,82,29,205,30,247,158,219,169,14,114,79,231,30,14,176,195,238,0,147,195,206,54,51,11,209,235,12,130,154,15,212,16,196,136,148,212,181,64,34,164,16,65,76,240,154,93,192,110,10,166,146,15,68,41,69,244,248,168,180,146,244,126,127,191,223,204,236,236,11,55,241,94,77,143,174,187,191,231,247,241,249,62,126,223,223,47,155,161,30,126,152,158,69,63,68,223,230,143,243,105,174,128,245,11,74,78,54,111,179,57,50,88,198,158,177,224,239,47,166,103,36,205,73,72,181,37,162,85,44,176,138,53,205,98,117,216,173,22,27,147,10,31,22,171,133,177,51,86,155,197,193,164,219,28,86,171,131,118,186,5,86,150,115,178,5,198,225,200,64,147,24,152,196,164,217,25,75,154,205,97,115,88,172,105,14,6,230,50,52,205,208,105,140,221,98,179,58,24,187,211,195,201,238,156,108,214,97,205,72,202,76,133,73,86,180,19,44,78,91,82,25,91,154,141,161,173,52,99,131,173,44,14,135,205,146, -102,119,88,211,83,83,157,110,214,167,240,162,87,219,139,183,88,24,75,70,190,37,45,3,104,126,251,237,183,147,45,54,154,80,96,131,197,44,180,13,72,181,64,27,109,99,210,44,246,116,58,221,238,176,56,104,43,44,110,79,163,237,78,31,43,177,197,177,89,183,223,150,245,52,218,201,43,28,44,145,244,152,197,146,6,83,82,103,165,62,100,177,165,1,163,14,171,205,238,72,163,97,115,134,97,172,86,198,98,101,210,211,25,123,170,61,205,89,196,177,30,78,202,201,126,35,239,173,191,60,243,194,236,127,204,167,178,101,107,6,245,44,16,195,61,146,147,45,211,25,84,118,174,34,250,120,183,203,233,74,113,165,204,83,36,97,158,40,113,174,20,89,114,123,68,183,43,101,110,190,232,87,240,120,217,245,48,231,117,205,246,203,185,100,190,156,67,177,18,71,137,249,175,112,110,69,166,96,31,190,132,243,80,5,146,88,76,161,117,240,32,10,235,139,82,138,88,133,42,16,165,98,138,245,249,56,144,133,215,205,81,172,23,70,251,189,110,36,101,86,224,149,50,74,44,64, -75,178,84,62,167,148,114,156,151,130,173,57,9,47,70,229,139,18,236,128,231,240,176,91,9,207,149,38,107,28,152,254,179,103,252,125,14,77,101,255,133,166,103,211,244,156,4,58,153,78,102,236,246,68,74,67,141,222,14,82,167,242,244,159,65,98,115,208,18,76,6,245,55,47,108,91,192,2,137,30,174,128,247,242,136,64,68,91,65,144,35,78,214,118,183,106,219,59,65,128,78,99,165,208,31,9,174,68,167,78,20,229,122,91,223,56,201,180,179,222,155,144,168,19,241,76,177,15,36,82,194,75,138,159,21,128,16,89,145,252,110,69,148,66,246,69,252,90,169,16,190,244,25,57,145,82,40,17,121,79,12,33,128,212,48,33,207,179,101,32,244,208,65,9,250,207,92,196,86,38,104,59,151,116,160,175,161,67,93,143,4,197,42,133,118,37,230,185,158,8,118,210,58,155,4,37,160,116,132,33,69,4,164,240,50,85,204,41,69,162,135,202,47,211,20,224,45,196,74,23,75,189,148,128,9,164,18,248,2,202,203,113,30,206,147,136,49,33,113,30,191,27,141,83,138,56, -74,230,95,231,144,190,48,112,16,82,160,219,173,176,222,66,129,195,210,179,101,232,34,75,154,7,226,147,114,102,191,153,201,21,112,18,135,80,9,52,184,253,18,124,87,200,252,224,84,234,229,34,192,164,222,40,22,251,0,157,50,38,140,16,53,11,190,83,178,194,74,208,82,202,43,69,88,62,20,247,170,159,47,97,5,180,30,44,141,70,115,175,1,188,0,241,132,206,132,231,56,5,13,76,72,76,158,15,191,19,18,19,147,169,44,180,17,44,230,102,5,65,54,43,6,91,136,32,224,101,48,26,101,42,1,239,136,88,199,123,18,140,210,186,84,100,240,184,168,15,147,194,203,17,226,113,61,26,98,75,255,35,84,205,245,120,16,111,211,193,10,245,107,176,138,28,106,134,149,252,122,92,184,130,45,101,131,83,196,53,17,12,70,24,103,104,56,84,21,154,76,144,252,65,84,240,215,47,131,67,67,128,32,202,198,83,163,78,65,190,141,42,4,255,231,53,154,13,169,134,161,13,232,15,131,27,64,223,31,78,66,152,58,12,239,17,167,30,34,85,240,18,203,123,149,160, -155,9,145,253,211,18,91,154,75,161,79,99,128,73,226,64,115,176,125,86,180,157,221,162,87,86,34,183,14,186,139,16,79,17,182,182,225,38,40,195,245,97,90,131,74,75,166,180,212,129,226,139,125,2,87,12,138,99,177,75,6,13,113,200,75,70,19,115,41,72,25,113,20,203,224,95,196,161,197,48,238,80,148,36,40,26,0,176,185,16,7,165,15,100,193,184,225,31,81,54,143,28,146,172,152,77,52,241,238,235,14,176,28,67,115,8,43,185,24,49,49,164,11,121,7,103,210,187,33,226,121,224,69,0,219,165,200,209,16,158,129,91,214,227,33,120,71,108,19,75,208,130,56,235,69,182,128,92,18,194,171,135,196,96,217,159,239,134,65,178,62,131,236,117,71,218,210,200,156,253,230,75,172,225,121,239,190,28,51,185,98,177,36,90,172,141,42,13,9,143,214,18,154,233,37,66,134,6,5,130,167,32,17,197,43,146,176,28,38,50,153,120,177,132,147,176,89,160,100,2,219,155,211,196,246,180,174,154,50,25,126,164,127,54,22,14,115,206,137,65,159,74,204,91,19,85, -150,41,62,35,33,72,156,226,151,188,50,229,21,33,55,124,157,147,68,202,235,47,206,7,211,194,41,159,196,249,32,6,1,191,72,20,188,230,112,189,50,226,189,152,149,10,121,175,225,64,131,6,230,154,173,39,90,176,60,153,5,194,149,180,204,128,204,130,116,200,199,99,135,140,242,74,112,160,228,27,104,195,35,114,136,24,5,114,72,65,68,249,64,16,205,230,80,110,242,240,5,126,129,232,80,35,149,146,69,216,92,246,113,110,190,128,119,83,242,2,222,139,51,16,174,160,0,5,209,4,129,95,192,81,133,2,202,125,89,73,244,67,152,69,27,60,227,225,149,103,121,78,240,36,198,212,182,46,42,36,165,100,138,138,204,94,131,255,205,7,58,61,172,228,65,233,132,2,68,144,88,175,117,254,195,245,152,235,49,146,25,1,175,50,7,194,65,225,35,234,20,196,169,40,115,122,178,128,136,46,22,101,69,40,51,98,27,89,135,74,128,0,198,10,224,19,19,205,41,58,104,71,75,188,53,61,193,130,115,33,255,32,222,178,88,59,0,40,160,36,88,12,188,34,11,76, -154,34,155,204,99,141,22,10,98,62,80,200,123,17,141,208,3,121,93,104,143,126,10,192,73,11,82,123,62,242,179,50,95,232,37,52,250,189,2,95,12,250,246,232,224,50,168,209,68,50,55,132,100,172,64,157,68,125,57,196,27,135,115,74,61,248,191,56,159,18,68,113,129,235,145,2,142,19,76,135,9,234,141,55,224,0,152,230,180,48,52,227,180,164,211,14,39,147,206,88,139,44,25,115,18,24,26,108,3,143,123,86,35,57,199,233,36,13,166,13,130,171,26,189,65,2,141,166,121,98,49,194,6,252,158,195,224,22,33,213,134,78,150,233,169,25,193,131,1,120,243,236,36,234,5,191,160,157,19,192,103,105,243,159,160,94,16,147,131,63,230,204,225,139,217,66,206,153,106,97,30,97,172,105,106,197,105,117,139,170,170,21,223,221,130,79,245,151,37,13,23,15,244,45,85,27,91,213,222,222,155,85,159,52,110,59,218,183,117,69,95,93,231,226,214,190,195,13,203,85,245,210,250,145,13,223,15,245,7,250,171,7,3,117,3,173,181,227,199,155,187,14,93,109,26,255, -15,180,161,166,205,208,134,154,174,65,27,106,90,60,24,216,57,168,170,171,235,63,168,157,58,253,179,78,134,197,128,62,241,146,40,43,194,94,83,31,128,88,12,103,238,111,94,153,83,102,198,221,167,13,23,15,246,85,169,141,59,106,246,246,221,184,212,187,242,243,158,163,171,63,89,119,160,226,252,119,123,22,111,220,251,222,215,155,143,119,93,190,217,181,106,97,131,170,174,26,233,252,121,253,145,142,195,63,12,12,54,236,28,216,125,108,164,233,63,109,181,117,213,77,53,251,3,227,205,31,7,134,155,222,27,232,63,116,117,96,203,80,123,109,117,211,34,220,26,24,30,192,173,3,135,87,142,52,93,28,171,235,56,210,82,255,251,88,103,231,212,208,10,85,157,58,182,232,198,46,245,223,187,12,181,78,199,42,36,29,119,131,215,161,109,85,21,189,13,171,191,236,155,220,93,113,125,101,239,169,133,199,23,86,239,106,57,213,125,106,162,113,231,175,23,235,127,90,243,233,174,107,163,31,151,171,106,207,216,138,109,45,191,223,104,61,120,253,198,209,145,137,237,91,107,91, -14,181,159,30,234,31,8,192,183,101,135,218,241,55,220,8,223,90,2,228,219,177,137,177,129,35,191,110,220,82,115,164,126,121,199,239,131,234,231,234,129,169,242,157,181,157,229,223,196,197,226,83,126,69,17,189,51,87,231,182,42,181,173,97,117,101,223,165,221,21,221,123,26,27,27,219,79,111,190,62,160,214,92,110,95,84,185,126,195,240,230,13,23,58,127,188,212,162,170,151,235,39,183,124,123,232,219,235,129,51,43,47,78,174,104,63,58,113,118,195,173,246,79,107,137,62,15,52,19,125,142,31,34,250,92,78,180,28,168,33,90,30,168,217,126,116,162,107,195,222,235,107,2,245,23,126,175,5,52,55,254,84,241,243,216,103,187,227,98,20,34,136,247,46,64,247,35,100,152,192,235,191,213,202,190,91,213,151,123,219,42,250,142,54,54,45,57,189,113,108,184,242,151,182,186,119,151,93,30,185,242,65,133,170,182,172,255,241,194,177,91,251,187,2,117,91,191,222,253,117,160,125,83,237,192,161,230,225,166,253,85,129,118,252,173,163,105,63,254,134,27,225,219,65,210,29, -88,211,222,49,48,186,251,230,141,141,147,192,96,99,119,249,210,237,135,111,124,31,55,131,119,3,176,136,67,208,102,239,59,26,135,35,229,141,45,171,123,150,244,14,148,191,255,205,199,55,91,135,23,159,252,236,76,247,18,85,253,113,234,135,147,19,95,125,209,84,245,83,215,180,28,237,35,12,55,117,227,238,45,91,87,237,250,42,176,255,219,133,234,160,122,174,124,170,237,215,47,227,131,169,192,186,23,204,156,175,131,160,185,230,154,222,222,169,173,123,23,86,245,247,168,139,126,88,62,186,243,82,253,240,129,159,143,47,239,85,213,155,63,86,77,222,232,31,218,185,37,30,151,186,25,121,222,143,234,246,125,216,113,125,169,170,110,92,181,184,255,252,123,155,226,98,6,231,29,145,204,252,19,194,255,31,198,97,55,4,136,175,126,233,93,177,241,183,182,222,246,85,251,247,252,246,217,158,201,35,13,11,87,94,57,187,30,172,237,253,51,157,61,219,219,167,38,78,108,233,175,35,228,95,56,68,200,143,21,56,26,7,70,91,47,126,127,177,250,128,170,238,93,179,105,219, -177,242,197,193,96,241,156,8,73,36,138,17,36,199,144,245,234,198,60,114,170,64,25,157,135,151,125,2,91,134,66,58,228,127,222,194,89,20,78,191,140,108,139,130,217,115,37,137,45,187,109,152,201,18,125,243,57,84,134,85,68,105,134,178,66,193,244,224,82,245,195,11,171,123,251,110,190,219,90,94,179,225,200,191,222,217,115,162,178,188,111,229,119,125,149,99,99,93,103,183,45,61,121,110,84,237,86,213,201,147,87,55,95,253,229,218,196,150,201,11,67,163,59,206,55,183,118,141,87,15,174,58,184,3,62,91,191,28,62,3,159,93,53,85,43,224,115,124,232,243,214,77,39,118,86,170,234,251,107,87,78,126,177,232,157,248,96,44,130,183,45,254,127,243,181,12,248,186,121,120,248,74,71,127,160,238,248,178,125,129,15,235,142,95,109,170,175,59,190,239,106,127,224,220,241,171,253,215,2,117,27,175,76,156,12,92,236,236,105,106,56,81,223,191,177,155,240,85,181,102,71,156,124,61,207,21,40,119,139,43,140,236,165,189,109,31,215,44,106,187,85,125,254,212,134,37, -223,173,171,220,211,60,86,121,96,213,238,181,215,222,235,89,119,174,113,89,251,201,179,229,128,252,75,191,125,219,124,126,112,229,141,213,107,91,70,218,207,214,236,171,14,12,174,29,90,118,180,125,188,127,168,126,112,12,26,7,206,244,87,111,10,76,5,96,217,115,245,21,227,103,42,215,197,197,78,38,95,88,116,87,249,1,45,181,237,95,183,184,247,230,187,23,218,222,89,50,217,178,167,119,211,138,77,135,199,70,23,141,86,126,211,221,179,163,178,243,135,14,181,94,61,213,113,253,220,238,43,31,109,223,212,12,236,140,15,53,45,1,118,90,2,39,182,141,247,87,7,62,95,219,3,141,136,197,83,131,163,35,11,85,117,73,253,246,247,255,101,230,231,173,183,66,43,220,86,227,112,130,207,53,90,221,139,84,213,224,20,43,176,138,126,66,9,157,1,231,217,220,144,243,108,174,126,94,205,205,53,102,230,61,110,212,53,114,99,213,237,97,120,158,105,148,149,202,50,245,60,153,151,247,135,87,208,202,2,230,242,9,26,225,140,190,146,207,159,47,240,238,184,136,9,86, -201,226,92,33,236,14,130,206,72,50,202,35,132,131,224,200,32,201,218,137,220,124,48,215,74,86,249,172,172,223,188,160,227,80,184,190,100,227,140,173,121,89,80,129,155,211,207,100,120,28,171,29,131,57,79,33,62,74,249,194,234,50,97,251,146,189,96,91,30,149,172,203,240,129,93,16,89,143,108,20,176,240,209,206,84,133,49,202,20,164,150,128,9,141,125,21,229,74,33,214,164,221,64,185,30,138,40,144,16,10,76,24,11,74,20,56,33,108,130,104,202,80,245,42,69,171,215,184,30,69,53,5,215,163,164,94,67,88,68,5,113,119,17,47,120,36,180,149,192,203,138,153,95,218,92,182,178,129,206,103,191,137,197,165,148,249,184,208,235,168,187,200,138,185,208,147,130,97,251,180,233,174,45,39,27,55,81,33,184,206,10,34,48,2,90,214,232,37,7,125,120,208,34,67,129,151,132,249,213,71,61,153,19,94,149,139,180,228,88,86,104,170,63,133,44,25,180,224,56,102,234,247,85,153,193,62,103,180,249,161,54,23,86,156,54,108,41,55,210,19,80,143,199,160,50,154, -221,17,149,225,226,150,199,164,58,173,29,95,204,148,242,30,248,100,21,69,226,243,209,93,2,178,7,153,147,74,80,85,70,54,91,44,186,111,32,87,140,216,46,81,233,73,55,73,100,219,2,132,70,148,245,72,40,166,24,151,6,38,251,212,139,230,47,227,13,145,83,64,55,152,172,0,35,113,49,133,78,166,104,92,197,38,253,94,15,216,172,162,123,130,82,125,18,247,42,50,78,173,122,86,196,161,205,254,168,33,100,167,132,2,213,112,251,127,200,52,12,197,160,31,58,200,40,23,65,39,149,229,122,82,19,91,52,93,62,158,245,164,161,56,42,12,254,78,99,241,231,51,205,95,67,46,107,245,198,96,77,61,137,200,53,88,68,230,189,138,201,70,172,148,43,207,253,90,100,189,125,62,167,16,215,236,229,74,137,144,163,149,193,241,220,217,111,190,28,210,159,148,66,101,226,202,33,85,194,10,126,14,250,93,73,200,111,69,92,217,69,212,131,167,175,252,62,199,41,33,172,76,87,248,141,78,199,60,173,144,22,228,199,112,39,225,73,67,100,21,255,30,249,11,176,158, -25,123,140,231,51,115,35,188,207,180,222,226,182,241,28,147,21,211,175,224,240,76,220,74,232,93,11,10,86,216,31,200,188,7,223,76,17,211,191,7,6,74,108,232,118,230,105,18,220,116,166,121,191,129,6,167,239,247,33,106,8,93,119,6,27,61,124,60,8,184,161,162,184,158,123,143,154,172,167,238,77,106,114,91,216,0,97,119,150,194,144,52,96,70,57,12,9,130,128,19,10,151,125,80,245,130,128,48,122,14,243,87,178,99,236,36,70,35,41,44,139,41,50,166,133,164,49,193,56,245,128,100,49,38,144,7,65,147,245,84,110,4,0,205,143,2,104,77,170,145,79,10,76,216,52,63,22,49,191,39,128,12,165,236,54,217,141,41,89,140,76,111,202,64,196,127,13,29,112,155,252,102,6,233,77,40,159,119,158,223,152,56,138,113,97,123,223,248,28,209,55,99,167,19,13,63,51,116,56,64,213,157,69,41,228,40,238,121,140,202,122,42,30,163,53,137,237,207,19,163,72,253,248,62,132,140,70,216,157,161,198,28,87,30,48,224,104,23,235,126,133,199,15,166,245,135, -19,250,211,144,103,69,65,16,75,81,184,53,122,240,27,13,240,148,16,214,201,27,141,34,78,240,161,203,22,16,27,186,123,9,123,164,2,113,216,252,222,84,123,233,163,189,183,192,61,179,140,144,142,43,132,102,21,68,137,228,248,49,43,170,186,189,226,151,21,237,213,28,126,140,154,128,159,196,115,10,121,205,97,126,64,135,211,10,86,144,69,242,166,130,242,137,178,241,4,155,44,48,221,243,176,120,94,131,145,141,34,15,132,81,94,58,199,247,116,209,84,240,141,241,44,47,207,149,100,154,233,54,119,69,125,83,25,43,0,71,43,46,188,68,140,193,29,94,37,138,166,142,24,207,33,245,80,103,206,193,208,115,169,104,227,49,241,186,229,136,232,113,13,182,70,79,212,177,175,225,215,174,175,250,121,244,54,198,92,40,152,169,226,50,163,231,48,127,122,205,153,14,102,15,170,234,204,89,202,159,65,113,81,50,222,40,138,51,114,149,123,172,182,50,179,218,66,82,215,153,234,45,44,91,120,112,84,23,251,32,122,31,105,143,202,249,47,124,149,253,29, +topic "Frame";[2 $$0,0#00000000000000000000000000000000:Default] +[i448;a25;kKO9;*@(64)2 $$1,0#37138531426314131252341829483380:class] +[l288;2 $$2,0#27521748481378242620020725143825:desc] +[a83;*R6 $$3,0#31310162474203024125188417583966:caption] +[l288;i1121;b17;O9;~~~.1408;2 $$4,0#10431211400427159095818037425705:param] +[i448;a25;kKO9;*@(64)2 $$5,0#37138531426314131252341829483370:item] +[*+117 $$6,6#14700283458701402223321329925657:header] +[{_}%EN-US +[s3; Frame&] +[s0; [^topic`:`/`/CtrlCore`/srcdoc`/AboutFrames`$en`-us^ Frames] are +objects derived from CtrlFrame class that form appearance and +functionality of area between outer Ctrl border and its view.&] +[s0; &] +[s0; &] +[s5;K%- [@(0.0.255) class]_[@0 CtrlFrame]&] +[s2; Interface definition of frame classes.&] +[s0;3 &] +[s0;:`:`:CtrlFrame`:`:CtrlFrame`(`):%- `~[* CtrlFrame]()&] +[s2; Empty virtual destructor.&] +[s0;3 &] +[s5;K%- virtual [@(0.0.255) void]_[@0 FrameLayout]([^`:`:Rect^ Rect]`&_[@3 r])_`=_[@3 0]&] +[s2; Frame reacts to this method by defining its own layout (if needed) +and reducing the size of Ctrl view rectangle.&] +[s4; [%-*C@3 r]-|Reference to current Ctrl rectangle. When Ctrl recomputes +its layout, it starts with Rect equivalent to its external size +(GetRect().Size()). Then it calls FrameLayout of all its frames +(starting with frame 0) and resulting Rect is the size of Ctrl`'s +view.&] +[s0;3 &] +[s5;K%- virtual [@(0.0.255) void]_[@0 FrameAddSize]([^`:`:Size^ Size]`&_[@3 sz])_`=_[@3 0]&] +[s2; Adds size of the frame to the current external size of Ctrl. +This is used to compute the external size of Ctrl for given size +of view.&] +[s4; [%-*C@3 sz]-|Reference to actual size of Ctrl.&] +[s0;3 &] +[s5;K%- virtual [@(0.0.255) void]_[@0 FramePaint]([^`:`:Draw^ Draw]`&_[@3 w], +[@(0.0.255) const]_[^`:`:Rect^ Rect]`&_[@3 r])&] +[s2; Paint the frame. Default implementation is empty.&] +[s4; [%-*C@3 w]-|Draw.&] +[s4; [%-*C@3 r]-|Outer rectangle of the frame (this is the same rectangle +as was given in last FrameLayout).&] +[s0;3 &] +[s5;K%- virtual [@(0.0.255) void]_[@0 FrameAdd]([^`:`:Ctrl^ Ctrl]`&_[@3 parent])&] +[s2; Called when frame is added to the Ctrl. Frame can use it to +add its subctrls to the parent. Default implementation is empty.&] +[s4; [%-*C@3 parent]-|Parent Ctrl.&] +[s0;3 &] +[s5;K%- virtual [@(0.0.255) void]_[@0 FrameRemove]()&] +[s2; Called when frame is removed from the Ctrl. Frame can use it +to remove subctrls from its parent. Default implementation is +empty. &] +[s0; &] +[s5;K:`:`:CtrlFrame`:`:OverPaint`(`)const:%- virtual [@(0.0.255) int]_[@0 OverPaint]()_[@(0.0.255) c +onst]&] +[s2; This method can returns non`-zero number that represents paint +extension margin of Ctrl rectangle `- frame can paint over this +margin despite that fact that it does not belong to the Ctrl +rectangle. This is useful to represent some specific skinning +effect (like glare around the EditField). Default implementation +returns zero. &] +[s0; &] +[s0; &] +[s0; &] +[s0; Standard static frames&] +[s0; U`+`+ defines several standard static frames. Those frames are +mostly used to define (or alter) appearance of border of Ctrls. +All of them are obtained as a reference to single global instance +by single global function and can be assigned to unlimited number +of Ctrls.&] +[s0; Appearance of some of them can be altered by current OS look`&feel.&] +[s0; &] +[ {{3967:1202:1908:2923h1;@(204) [s0; Function] +:: [s0; altered by look`&feel] +:: [s0; Appearance] +:: [s0; Comment] +::@2 [s0; CtrlFrame`&_[* NullFrame]()] +:: [s0; No.] +:: [s0; +@@image:612&237 +…ٟ֜ɥɒ˥ʮܪɥ˥ +ʮܪɥ˥ˀ +] +:: [s0; [1 Default Frame for Ctrl.]] +:: [s0; CtrlFrame`&_[* InsetFrame]()] +:: [s0; No.] +:: [s0; +@@image:612&237 +…ؐЃ†ęܹͤٷ׵˜ʿ٩ΰ +̥䪨өʦҲ̥䪥ʩ֎٩ᗵ׬᷷ҌۅȽ +] +:: [s0; ] +:: [s0; CtrlFrame`&_[* OutsetFrame]()] +:: [s0; No.] +:: [s0; +@@image:612&237 +…ұ뿃܂頻ߨጱ鶫Բ +ʥԲʥԲʬԲךˀ +] +:: [s0; ] +:: [s0; CtrlFrame`&_[* ButtonFrame]()] +:: [s0; No.] +:: [s0; +@@image:612&237 +…ѱￃ ʀ𲅄Ӥff댲 +̥ЪөʦҲ̥䪥өʔ鹟᳿ +] +:: [s0; ] +:: [s0; CtrlFrame`&_[* ThinInsetFrame]()] +:: [s0; No.] +:: [s0; +@@image:612&237 +…Ȁؠӄ񝃀̹ͿͥԪө +Ԫӵ̥Ԫө̥Ԫө̥߿땀 +] +:: [s0; ] +:: [s0; CtrlFrame`&_[* ThinOutsetFrame]()] +:: [s0; No.] +:: [s0; +@@image:612&237 +…бفʁϨӆ޳㺇ǾԪӵ̥ +Ԫө̥Ԫө̥ƲԪө̥ʦǥՂˀ +] +:: [s0; ] +:: [s0; CtrlFrame`&_[* BlackFrame]()] +:: [s0; No.] +:: [s0; +@@image:612&237 +…эĂɼ߻܋һʮܪɥ˥ +ʮܪɥ˥ʧơꙣ +] +:: [s0; ] +:: [s0; CtrlFrame`&_[* FieldFrame]()] +:: [s0; Yes.] +:: [s0; +@@image:612&237 +…ל瞀㷼ݦɗʮܪɥ +ɒ˥ʮܪɥ˥߮Ѐēہ +] +:: [s0; [1 Good for borders of all Ctrls that display somthing, like EditField +or ArrayCtrl.]] +:: [s0; CtrlFrame`&_[* TopSeparatorFrame]()] +:: [s0; Yes.] +:: [s0; +@@image:612&237 +…щÈ݄籉߀߸ꪮ +ѸˮˮˮҴݻ뾅 +] +:: [s0; ] +:: [s0; CtrlFrame`&_[* BottomSeparatorFrame]()] +:: [s0; Yes.] +:: [s0; +@@image:612&237 +…щÈ݄籉߀ɥ܊ƥ򩚗 +ɥޥݚɢ +] +:: [s0; ] +:: [s0; CtrlFrame`&_[* LeftSeparatorFrame]()] +:: [s0; Yes.] +:: [s0; +@@image:612&237 +…ژªЏ蠊灺ժˎٲƒ˖ +زҚᖬɒ蚃ㄘ +] +:: [s0; ] +:: [s0; CtrlFrame`&_[* RightSeparatorFrame]()] +:: [s0; Yes.] +:: [s0; +@@image:612&237 +…щ̘찈߅߄Ϻ浀񧶣ٲҩ˖ +ݱɒٲƒقÄ +] +:: [s0; ]}}&] +[s0;3 &] +[s0;3 &] +[s0; Simple Ctrl frame templates&] +[s0;3 &] +[s0;3 &] +[s5;K%- template_<[@(0.0.255) class]_[@3 T]>__[@(0.0.255) class]_[@0 FrameCtrl]_:_[@(0.0.255) pu +blic]_[@3 T], [@(0.0.255) public]_[^`:`:CtrlFrame^ CtrlFrame]&] +[s0;%- class_[* FrameCtrl]&] +[s2; &] +[s2; This is the base class of simple Ctrl frames `- frames that +place single Ctrl at some edge of parent Ctrl.&] +[s2; &] +[s2; This class basically overloads FrameAdd and FrameRemove virtual +methods of [^topic`:`/`/CtrlCore`/src`/Frame`$en`-us`#`:`:CtrlFrame`:`:class CtrlFrame^ C +trlFrame] so that they add/remove `'this`' from parent`'s children`-list.&] +[s2; &] +[s4; [%-*C@4 T]-|Ctrl type.&] +[s0; &] +[s0;%- [%%/ Derived from][%% ]T, [^topic`:`/`/CtrlCore`/src`/Frame`$en`-us`#`:`:CtrlFrame`:`:class CtrlFrame^@(0.0.255) C +trlFrame]&] +[s0;3 &] +[s0; &] +[s0; &] +[s0;%- template_&] +[s5;K%- template_<[@(0.0.255) class]_[@4 T]>__[@(0.0.255) class]_[@0 FrameLR]_:_[@(0.0.255) publ +ic]_[^`:`:FrameCtrl^ FrameCtrl]<[@4 T]>_&] +[s2; &] +[s2; This class extends CtrlFrame class with width attribute and +serves as base class to classes placing Ctrl at the left or right +size of parent Ctrl frame. Width is initialized to 0. 0 as width +indicates that width is equal to the height.&] +[s2; &] +[s4; [%-*C@4 T]-|Ctrl type.&] +[s0; &] +[s0;%- [%%/ Derived from][%% ][^topic`:`/`/CtrlCore`/src`/Frame`$en`-us`#`:`:FrameCtrl`:`:template ` class FrameCtrl^ F +rameCtrl] &] +[s0;3 &] +[s0;:`:`:FrameLR`:`:FrameLR`(`):%- FrameLR`&_[* Width](int_[*@3 `_cx])&] +[s2; Sets the new width.&] +[s4; [%-*C@3 `_cx]-|Width.&] +[s4; [*/ Return value]-|`*this.&] +[s0;3 &] +[s5;K%- [@(0.0.255) int]_[@0 GetWidth]()_[@(0.0.255) const]&] +[s4; [*/ Return value]-|Current width.&] +[s0; &] +[s0;3 &] +[s0;3 &] +[s0;3 &] +[s5;K%- template_<[@(0.0.255) class]_[@4 T]>__[@(0.0.255) class]_[@0 FrameLeft]_:_[@(0.0.255) pu +blic]_[^`:`:FrameLR^ FrameLR]<[@4 T]>_&] +[s0;%- class_[* FrameLeft]&] +[s2; &] +[s2; This class places Ctrl to the parent`'s left side as frame.&] +[s0; &] +[s4; [%-*C@4 T]-|Ctrl type.&] +[s0; &] +[s0;%- [%%/ Derived from][%% ][^topic`:`/`/CtrlCore`/src`/Frame`$en`-us`#`:`:FrameLR`:`:template ` class FrameLR^ F +rameLR] &] +[s0;3 &] +[s0;3 &] +[s0;3 &] +[s5;K%- template_<[@(0.0.255) class]_[@4 T]>__[@(0.0.255) class]_[@0 FrameRight]_:_[@(0.0.255) p +ublic]_[^`:`:FrameLR^ FrameLR]<[@4 T]>_&] +[s0;%- class_[* FrameRight]&] +[s2; &] +[s2; This class places Ctrl to the parent`'s right side as frame.&] +[s0; [%-*C@4 T]-|Ctrl type.&] +[s0;%- [%%/ Derived from][%% ][^topic`:`/`/CtrlCore`/src`/Frame`$en`-us`#`:`:FrameLR`:`:template ` class FrameLR^ F +rameLR] &] +[s0; &] +[s0; &] +[s0;3 &] +[s5;K%- [@(0.0.255) template]_<[@(0.0.255) class]_[@4 T]>__[@(0.0.255) class]_[@0 FrameTB]_:_[@(0.0.255) p +ublic]_[^`:`:FrameCtrl^ FrameCtrl]<[@4 T]>_&] +[s0;%- class_[* FrameTB]&] +[s2; &] +[s2; This class extends CtrlFrame class with height attribute and +serves as base class to classes placing Ctrl as the top or bottom +side of parent Ctrl frame. Height is initialized to 0. 0 as height +indicates that height is equal to the width.&] +[s2; &] +[s0; [%-*C@4 T]-|Ctrl type.&] +[s0;%- [%%/ Derived from][%% ][^topic`:`/`/CtrlCore`/src`/Frame`$en`-us`#`:`:FrameCtrl`:`:template ` class FrameCtrl^ F +rameCtrl] &] +[s0;3 &] +[s5;K%- [^`:`:FrameTB^ FrameTB]`&_[@0 Height]([@(0.0.255) int]_[@3 `_cy])&] +[s2; Sets the new height.&] +[s4; [%-*C@3 `_cy]-|Height.&] +[s4; [*/ Return value]-|`*this.&] +[s0; &] +[s5;K%- [@(0.0.255) int]_[@0 GetHeight]()_[@(0.0.255) const]&] +[s4; [*/ Return value]-|Current height.&] +[s0; &] +[s0; &] +[s0; &] +[s0;3 &] +[s5;K%- template_<[@(0.0.255) class]_[@4 T]>__[@(0.0.255) class]_[@0 FrameTop]_:_[@(0.0.255) pub +lic]_[^`:`:FrameTB^ FrameTB]<[@4 T]>_&] +[s0;%- class_[* FrameTop]&] +[s2; &] +[s2; This class places Ctrl to the parent`'s top side as frame.&] +[s0; [%-*C@4 T]-|Ctrl type.&] +[s0;%- [%%/ Derived from][%% ][^topic`:`/`/CtrlCore`/src`/Frame`$en`-us`#`:`:FrameTB`:`:template ` class FrameTB^ F +rameTB] &] +[s0; &] +[s0; &] +[s0;3 &] +[s5;K%- template_<[@(0.0.255) class]_[@4 T]>__[@(0.0.255) class]_[@0 FrameBottom]_:_[@(0.0.255) p +ublic]_[^`:`:FrameTB^ FrameTB]<[@4 T]>_&] +[s0;%- class_[* FrameBottom]&] +[s2; &] +[s2; This class places Ctrl to the parent`'s bottom side as frame.&] +[s0; [%-*C@4 T]-|Ctrl type.&] +[s0;%- [%%/ Derived from][%% ][^topic`:`/`/CtrlCore`/src`/Frame`$en`-us`#`:`:FrameTB`:`:template ` class FrameTB^ F +rameTB] &] +[s0; &] +[s0; &] +[s0; Frame utility functions&] +[s0; Following functions are intended as helpers to for implementation +of FrameLayout method of CtrlFrame, placing some Ctrl to the +side of parent Ctrl. They adjust given Rect (parameter of FrameLayout) +and also alter position of given Ctrl.&] +[s0;3 &] +[s5;K%- [@(0.0.255) void]_[@0 LayoutFrameLeft]([^`:`:Rect^ Rect]`&_[@3 r], +[^`:`:Ctrl^ Ctrl]_`*[@3 ctrl], [@(0.0.255) int]_[@3 cx])&] +[s2; Places ctrl at the left side of parent Ctrl.&] +[s4; [%-*C@3 r]-|Current parent Ctrl rect.&] +[s4; [%-*C@3 ctrl]-|Ctrl to be placed.&] +[s4; [%-*C@3 cx]-|Required width.&] +[s0;3 &] +[s5;K%- [@(0.0.255) void]_[@0 LayoutFrameRight]([^`:`:Rect^ Rect]`&_[@3 r], +[^`:`:Ctrl^ Ctrl]_`*[@3 ctrl], [@(0.0.255) int]_[@3 cx])&] +[s2; Places ctrl at the right side of parent Ctrl.&] +[s4; [%-*C@3 r]-|Current parent Ctrl rect.&] +[s4; [%-*C@3 ctrl]-|Ctrl to be placed.&] +[s4; [%-*C@3 cx]-|Required width.&] +[s0;3 &] +[s5;K%- [@(0.0.255) void]_[@0 LayoutFrameTop]([^`:`:Rect^ Rect]`&_[@3 r], +[^`:`:Ctrl^ Ctrl]_`*[@3 ctrl], [@(0.0.255) int]_[@3 cy])&] +[s2; Places ctrl at the top side of parent Ctrl.&] +[s4; [%-*C@3 r]-|Current parent Ctrl rect.&] +[s4; [%-*C@3 ctrl]-|Ctrl to be placed.&] +[s4; [%-*C@3 cy]-|Required height.&] +[s0;3 &] +[s5;K%- [@(0.0.255) void]_[@0 LayoutFrameBottom]([^`:`:Rect^ Rect]`&_[@3 r], +[^`:`:Ctrl^ Ctrl]_`*[@3 ctrl], [@(0.0.255) int]_[@3 cy])&] +[s2; Places ctrl at the bottom side of parent Ctrl.&] +[s4; [%-*C@3 r]-|Current parent Ctrl rect.&] +[s4; [%-*C@3 ctrl]-|Ctrl to be placed.&] +[s4; [%-*C@3 cy]-|Required height.&] +[s0; ] \ No newline at end of file diff --git a/uppsrc/CtrlCore/src.tpp/Layout$en-us.tpp b/uppsrc/CtrlCore/src.tpp/Layout$en-us.tpp index 7f72cd803..310fa5b49 100644 --- a/uppsrc/CtrlCore/src.tpp/Layout$en-us.tpp +++ b/uppsrc/CtrlCore/src.tpp/Layout$en-us.tpp @@ -1,6 +1,75 @@ -TITLE("Layout functions") -COMPRESSED -120,156,237,86,219,110,219,70,16,253,149,1,114,129,164,90,234,222,72,174,196,162,136,161,232,193,176,17,23,174,130,20,32,104,121,69,174,163,173,41,82,225,46,157,24,117,253,237,93,94,36,83,174,28,195,65,30,226,192,122,32,41,238,156,153,51,51,103,118,25,16,120,249,18,237,161,23,232,129,223,232,173,60,23,69,98,194,64,49,198,125,65,28,255,226,240,120,232,247,222,116,92,214,45,189,96,235,133,122,152,114,135,98,70,92,123,193,20,19,135,80,134,57,25,50,78,41,71,163,40,17,90,135,65,66,56,247,75,16,177,32,226,57,4,123,140,51,142,169,199,137,197,18,132,8,242,136,131,25,229,196,25,197,82,71,97,32,56,245,123,39,174,5,209,50,146,117,142,176,75,152,199,8,162,136,48,27,10,115,206,176,231,112,58,116,221,81,36,86,70,101,105,19,75,97,76,176,63,199,158,111,57,223,220,220,12,48,67,53,3,102,157,97,196,44,85,108,223,33,70,60,236,12,209,208,225,152,35,106,157,59,30,114,70,43,145,139,229,253,169,59,15,166,238,161,145, -50,210,186,232,253,130,177,103,33,238,158,251,2,51,207,38,202,41,115,184,135,108,112,66,8,165,4,83,50,28,18,199,117,188,209,66,138,88,230,97,240,207,236,223,87,147,119,253,247,127,66,160,169,15,193,43,132,250,8,193,145,184,202,10,3,231,69,26,149,169,234,240,117,24,104,228,67,235,230,248,135,27,115,27,127,149,8,35,103,191,133,205,171,55,29,52,64,3,226,56,93,104,26,211,152,206,54,22,12,142,54,111,127,159,205,118,32,47,51,21,239,0,34,56,72,149,169,41,110,150,59,235,167,211,179,209,217,104,108,242,228,20,202,235,198,224,236,245,173,7,10,81,123,105,15,54,224,163,211,22,171,109,72,178,29,176,91,213,132,248,176,175,181,250,152,234,102,29,170,134,74,35,115,13,38,131,165,92,206,101,94,49,129,75,145,43,49,79,164,134,236,28,130,91,143,123,32,210,24,68,28,91,196,66,46,75,152,189,131,94,201,72,157,43,25,67,208,91,51,30,148,49,153,237,83,111,92,213,175,127,61,46,171,11,157,44,7,109,242,34,50,69,46,187,240,89, -153,197,157,152,131,187,28,150,133,54,176,16,151,18,86,197,60,81,17,136,40,146,90,111,34,212,105,218,56,77,232,254,245,31,34,151,169,169,252,236,178,106,178,233,95,175,201,129,74,181,17,105,36,7,223,87,54,211,111,149,77,201,252,94,217,76,79,91,142,191,34,150,71,245,189,85,254,19,249,169,80,185,237,102,99,95,213,127,46,33,75,101,169,135,185,208,178,206,185,214,199,116,187,213,211,237,250,131,185,90,201,71,180,234,103,41,254,237,164,182,201,218,13,202,236,136,217,178,88,136,252,214,224,172,215,114,111,148,73,228,255,155,59,22,73,162,91,156,171,17,181,83,153,66,84,173,76,75,152,237,178,89,100,113,53,206,235,17,133,176,35,42,97,168,244,35,8,104,206,10,91,237,47,102,61,216,211,108,245,65,165,113,246,185,251,93,123,124,199,170,78,172,127,93,135,170,255,254,120,90,56,62,124,218,106,16,205,38,176,111,55,207,149,201,242,206,193,219,227,195,238,186,211,193,175,144,93,132,59,15,129,202,197,82,92,216,105,87,166,50,142,235,207,32,152,23, -198,88,197,116,132,61,122,47,109,83,98,152,95,193,36,181,59,203,179,94,204,184,60,79,146,159,67,51,39,242,111,25,213,154,25,239,191,27,79,142,218,186,137,234,68,31,169,157,26,117,143,132,116,244,44,32,187,225,60,45,9,109,81,127,214,208,15,161,161,201,23,245,100,62,98,30,208,79,235,220,154,252,117,48,109,171,71,150,89,62,253,179,43,252,15,74,68,176,184, +topic "Layout functions";[2 $$0,0#00000000000000000000000000000000:Default] +[i448;a25;kKO9;*@(64)2 $$1,0#37138531426314131252341829483380:class] +[l288;2 $$2,0#27521748481378242620020725143825:desc] +[a83;*R6 $$3,0#31310162474203024125188417583966:caption] +[l288;i1121;b17;O9;~~~.1408;2 $$4,0#10431211400427159095818037425705:param] +[i448;a25;kKO9;*@(64)2 $$5,0#37138531426314131252341829483370:item] +[*+117 $$6,6#14700283458701402223321329925657:header] +[{_}%EN-US +[s3;%- Layout functions&] +[s0; &] +[s0; &] +[s5;K:`:`:InitLayout`(`:`:Ctrl`&`,L`&`):%- template_<[@(0.0.255) class]_[@4 L]>__[@(0.0.255) v +oid]_[@0 InitLayout]([^`:`:Ctrl^ Ctrl]`&_[@3 ctrl], [^L^ L]`&_[@3 layout])&] +[s2; Assigns layout parameters to member Ctrl variables of [@3 layout], +and adds them to the specified [*@3 ctrl].&] +[s4; [*C@4 L]-|Class (or structure) with Ctrl variables. Ctrl variables +must have public access.&] +[s4; [%-*C@3 ctrl]-|Parent Ctrl.&] +[s4; [%-*C@3 layout]-|[*C@4 L] instance.&] +[s0; &] +[s5;K:`:`:CtrlLayout`(T`&`):%- template_<[@(0.0.255) class]_[@4 T]>__[@(0.0.255) void]_[@0 Ct +rlLayout]([^T^ T]`&_[@3 ctrl])&] +[s2; Assigns layout parameters to member variables. Required layout +must be one of base classes of T.&] +[s4; [*C@4 T]-|Parent Ctrl type.&] +[s4; [%-*C@3 ctrl]-|Parent Ctrl.&] +[s0; &] +[s5;K:`:`:CtrlLayout`(T`&`,const char`*`):%- template_<[@(0.0.255) class]_[@4 T]>__[@(0.0.255) v +oid]_[@0 CtrlLayout]([^T^ T]`&_[@3 ctrl], [@(0.0.255) const]_[@(0.0.255) char]_`*[@3 title])&] +[s2; Calls CtrlLayout and then calls Title method of [*@3 ctrl ](assigning +a caption text to the TopWindow).&] +[s4; [*C@4 T]-|Parent Ctrl type.&] +[s4; [%-*C@3 ctrl]-|Parent Ctrl.&] +[s4; [%-*C@3 title]-|Window title.&] +[s0; &] +[s5;K:`:`:CtrlLayoutOK`(T`&`,const char`*`):%- template_<[@(0.0.255) class]_[@4 T]>__[@(0.0.255) v +oid]_[@0 CtrlLayoutOK]([^T^ T]`&_[@3 ctrl], [@(0.0.255) const]_[@(0.0.255) char]_`*[@3 title]) +&] +[s2; Calls CtrlLayout and then assigns Acceptor(IDOK) to the [/ ok] +member Ctrl variable and makes it the default button (activated +by Enter).&] +[s4; [*C@4 T]-|Parent Ctrl type.&] +[s4; [%-*C@3 ctrl]-|Parent Ctrl.&] +[s4; [%-*C@3 title]-|Window title.&] +[s0; &] +[s5;K:`:`:CtrlLayoutCancel`(T`&`,const char`*`):%- template_<[@(0.0.255) class]_[@4 T]>__ +[@(0.0.255) void]_[@0 CtrlLayoutCancel]([^T^ T]`&_[@3 ctrl], [@(0.0.255) const]_[@(0.0.255) c +har]_`*[@3 title])&] +[s2; Calls CtrlLayout and then assigns Rejector(IDCANCEL) to the +[/ cancel] member Ctrl variable and makes it the default cancel +button (activated by Esc).&] +[s4; [*C@4 T]-|Parent Ctrl type.&] +[s4; [%-*C@3 ctrl]-|Parent Ctrl.&] +[s4; [%-*C@3 title]-|Window title.&] +[s0; &] +[s5;K:`:`:CtrlLayoutOKCancel`(T`&`,const char`*`):%- template_<[@(0.0.255) class]_[@4 T]> +__[@(0.0.255) void]_[@0 CtrlLayoutOKCancel]([^T^ T]`&_[@3 ctrl], [@(0.0.255) const]_[@(0.0.255) c +har]_`*[@3 title])&] +[s2; Calls CtrlLayoutOK and then assigns Rejector(IDCANCEL) to the +[/ cancel] member Ctrl variable and makes it the default cancel +button (activated by Esc).&] +[s4; [*C@4 T]-|Parent Ctrl type.&] +[s4; [%-*C@3 ctrl]-|Parent Ctrl.&] +[s4; [%-*C@3 title]-|Window title.&] +[s0; &] +[s5;K:`:`:CtrlLayoutExit`(T`&`,const char`*`):%- template_<[@(0.0.255) class]_[@4 T]>__[@(0.0.255) v +oid]_[@0 CtrlLayoutExit]([^T^ T]`&_[@3 ctrl], [@(0.0.255) const]_[@(0.0.255) char]_`*[@3 titl +e])&] +[s2; Calls CtrlLayoutOK and then assigns Acceptor(IDEXIT) to the +[/ exit] member Ctrl variable and makes it the default button (activated +by Enter).&] +[s4; [*C@4 T]-|Parent Ctrl type.&] +[s4; [%-*C@3 ctrl]-|Parent Ctrl.&] +[s4; [%-*C@3 title]-|Window title.&] +[s0; ] \ No newline at end of file diff --git a/uppsrc/RichText/EncodeQtf.cpp b/uppsrc/RichText/EncodeQtf.cpp index 2fbb87c11..54cc6aa55 100644 --- a/uppsrc/RichText/EncodeQtf.cpp +++ b/uppsrc/RichText/EncodeQtf.cpp @@ -198,7 +198,7 @@ void QTFEncodePara(String& qtf, const RichPara& p, const RichPara::Format& style const RichPara::Part& part = p.part[i]; String cf; LngFmt(cf, part.format.language, lang); - CharFmt(cf, p.format, part.format); + CharFmt(cf, style, part.format); if(!cf.IsEmpty()) { qtf << '[' << cf << ' '; d += cf.GetLength();