From 8116ea371703aa9612249e9b2a9892def016cb73 Mon Sep 17 00:00:00 2001 From: vczh Date: Mon, 22 Sep 2025 06:38:45 -0700 Subject: [PATCH] Fixed all GacUI XML Resource build breaks --- .../control_ribbon_gallery/Resource.xml | 8 +++++--- .../ProgressAndAsync/UI/Resource.xml | 4 ++-- .../UI/Source/DemoPartialClasses.cpp | 4 ++-- Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x64 | Bin 25176 -> 25176 bytes Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x86 | Bin 25176 -> 25176 bytes .../GacUI_Xml/Binding_Bind/UI/Resource.xml | 2 +- .../UI/Source/DemoPartialClasses.cpp | 2 +- Tutorial/GacUI_Xml/Event_Cpp/UI/Resource.xml | 2 +- .../UI/Source/DemoPartialClasses.cpp | 2 +- .../GacUI_Xml/Event_Script/UI/Resource.xml | 2 +- .../UI/Source/DemoPartialClasses.cpp | 2 +- .../GacUI_Xml/Event_ViewModel/UI/Resource.xml | 2 +- .../UI/Source/DemoPartialClasses.cpp | 2 +- 13 files changed, 17 insertions(+), 15 deletions(-) diff --git a/SampleForDoc/GacUI/XmlRes/control_ribbon_gallery/Resource.xml b/SampleForDoc/GacUI/XmlRes/control_ribbon_gallery/Resource.xml index 06c7c2f2..16710b10 100644 --- a/SampleForDoc/GacUI/XmlRes/control_ribbon_gallery/Resource.xml +++ b/SampleForDoc/GacUI/XmlRes/control_ribbon_gallery/Resource.xml @@ -96,9 +96,11 @@ var pos = colorList.IndexToGalleryPos(index); var item = self.colorGroups[pos.group].Items[pos.item]; var log = $"$(name): $(item.IconColor)\r\n"; - textLog.Select({row:textLog.RowCount column:0}, {row:textLog.RowCount column:0}); + var rowCount = textLog.Document.paragraphs.GetCount(); + var start : TextPos = {row:rowCount column:0}; + textLog.SetCaret(start, start); textLog.SelectionText = log; - textLog.Select({row:textLog.RowCount column:0}, {row:textLog.RowCount column:0}); + textLog.SetCaret(start, start); } ]]> @@ -183,7 +185,7 @@ - + diff --git a/Tutorial/GacUI_Controls/ProgressAndAsync/UI/Resource.xml b/Tutorial/GacUI_Controls/ProgressAndAsync/UI/Resource.xml index 1b1f6bbe..2af0cb61 100644 --- a/Tutorial/GacUI_Controls/ProgressAndAsync/UI/Resource.xml +++ b/Tutorial/GacUI_Controls/ProgressAndAsync/UI/Resource.xml @@ -73,7 +73,7 @@ }, -1); }); textResult.Text = text; - textResult.Select({row:0 column:0}, {row:0 column:0}); + textResult.SetCaret({row:0 column:0}, {row:0 column:0}); } ]]> @@ -81,7 +81,7 @@ - + diff --git a/Tutorial/GacUI_Controls/ProgressAndAsync/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/ProgressAndAsync/UI/Source/DemoPartialClasses.cpp index 3668224e..3fad810c 100644 --- a/Tutorial/GacUI_Controls/ProgressAndAsync/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Controls/ProgressAndAsync/UI/Source/DemoPartialClasses.cpp @@ -242,7 +242,7 @@ Closures } (__vwsn_co0_text = ::demo::IStringAsync::CastResult(::vl::__vwsn::This(__vwsn_co_result_.Obj())->GetResult())); ::vl::__vwsn::This(__vwsnthis_0->textResult)->SetText(__vwsn_co0_text); - ::vl::__vwsn::This(__vwsnthis_0->textResult)->Select([&](){ ::vl::presentation::TextPos __vwsn_temp__; __vwsn_temp__.row = static_cast<::vl::vint>(0); __vwsn_temp__.column = static_cast<::vl::vint>(0); return __vwsn_temp__; }(), [&](){ ::vl::presentation::TextPos __vwsn_temp__; __vwsn_temp__.row = static_cast<::vl::vint>(0); __vwsn_temp__.column = static_cast<::vl::vint>(0); return __vwsn_temp__; }()); + ::vl::__vwsn::This(__vwsnthis_0->textResult)->SetCaret([&](){ ::vl::presentation::TextPos __vwsn_temp__; __vwsn_temp__.row = static_cast<::vl::vint>(0); __vwsn_temp__.column = static_cast<::vl::vint>(0); return __vwsn_temp__; }(), [&](){ ::vl::presentation::TextPos __vwsn_temp__; __vwsn_temp__.row = static_cast<::vl::vint>(0); __vwsn_temp__.column = static_cast<::vl::vint>(0); return __vwsn_temp__; }()); this->SetStatus(::vl::reflection::description::CoroutineStatus::Stopped); return; } @@ -400,7 +400,7 @@ Class (::demo::MainWindowConstructor) ::vl::__vwsn::This(__vwsn_this_)->SetNamedObject(::vl::WString::Unmanaged(L"textResult"), ::vl::__vwsn::Box(this->textResult)); } { - ::vl::__vwsn::This(this->textResult)->SetReadonly(true); + ::vl::__vwsn::This(this->textResult)->SetEditMode(::vl::presentation::controls::GuiDocumentEditMode::Selectable); } { ::vl::__vwsn::This(this->textResult)->SetVerticalAlwaysVisible(false); diff --git a/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x64 b/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x64 index 6d96c0bef63cc821213cf90a02bbeabab3093e90..29338b01e67005fbf2a8476ed2b5f7dc7353c707 100644 GIT binary patch delta 800 zcmY*XK}%Fo6!yON=FNF;M(0jN^QH!UTEr|;#|cWL%ogUxCWFw__ujk_gNzuB7Fq-YGm#7b0 zh)P0d_@TyA;;xa#lY+!EiiUabvT?;85m*QAB%H_Xz2t~HrgA>TR z68(j72<{oox)*x*1Sy{){3HLbP zBfi(+q%g~|BHNT+)z9c;mJS9@D_C#_DwLSphqpsg=$LS4%DX_&=Ew;z!7tI}HdG4P z;^rn^bG8cYcv`SAYD%1CE#~lFnc$!JPrc(0^QZf! delta 809 zcmYjP&r4KM6!yNK_s)#@OlaQN;5^O7w;7!#FpDM>p<0BrX(nghn>QmR2sxvescmc( zv%9m?%SW{CX z6?jwR?ZQL#DCKm*Qd_nBRP{z}0gFlod8Hc{lo;0ZG;Gbl7oCepkXXmQp1?0Pjcwgv z46jO2T-C-{E7r9>*1(ol6c!6p2#8ta=8P-Fbh%Td;yAIF*$xMd{s#-2o^i zlZr7gK=54?9PdkM^m^A3@l0yZ3VhrzaMiQ1M@21AJUxi81Ku`#^=9#$2C7=-5CsGG v%R?xY4Q!V!CS$*RiGFg%jZ&744-~UPY|FF`Grz7_GzG&HRjmvoIg$AX=F#&Z diff --git a/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x86 b/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x86 index d8615172340efb95cdaef4c247d8c93f76aad551..f418dc692e33610b54f32751eaaa78fa502096d2 100644 GIT binary patch delta 631 zcmah_L2DC16wd5!X5Z{?n+b)uu_4{Wqz#3n+bSN41U-nCwhD?Rb=PF22fb9iXg!FY z1d&+e`wN29QzRe=UMfW`h80c!pn~F)hiq8S8pO` zOya9Pi+6evv&LCG(d$^z8;aHx^;BHPKri9pQ3sc~j|P{5r5zj3c*rc|%o#Y6&^FH{ zxn~wJRPkE~d@|?pzDKyxlOXOT{WF{%eUq^jg1ls7*r5qjX%g#Jh2_wtrouiQW=wTj z%)k$7uq>9uA%#V;pzxZgCRo6>aG0ie1uR)E9_J;NDX%Ke#d%?*gL1UVVwH4HH9};^qR5`o=94shWuIOaW@?&&AI_lEB?Kz8 zz{f^FxZjbDre!u8QwSXVa;aBH4JWlF2;IgDoCB zi0DBCUyq{TLC}LJQA7~5QV0c6k39+AMeEJ>kodD%!J`8+@6Ryv=J983g{`fy=S>Y` zT0!J{x|YX_GXwaQc2G=sxRxa>8XlU)FsjBLeA8XL*7xDQ-iJ;7H0Jc3cxm)vJmJIE z&*5oeTGfW|z${~sOMEp+$e6i>pJoofjWRx&Qn0vc;usHbqbBi;JFJZ+pQ3hbSm!Rr zOqbaR%){8fjqplrM}hi~2_>qul?l{oNX0vJkXcx!B1>VN2H6&jiUTUTVz-L(q7cOl zo`@7ngD1}-WfLC9ENL~F!AId>l=7^Fo5>^8`YYnQaIs`d?6r23lCkOzUYMJ`aw5Dm zb8#Uq_UQ4WgO_I(r;}j3S6k@9)fPg_Q{ z9HvD(%ABsu!G}FePAWXVRce66Z1h9cLRx%V%c?`@V54)v!St6f5h-3 TbTA%XSC^=$wqof0(>n48Zf(P6 diff --git a/Tutorial/GacUI_Xml/Binding_Bind/UI/Resource.xml b/Tutorial/GacUI_Xml/Binding_Bind/UI/Resource.xml index 6c551e05..7a5895d5 100644 --- a/Tutorial/GacUI_Xml/Binding_Bind/UI/Resource.xml +++ b/Tutorial/GacUI_Xml/Binding_Bind/UI/Resource.xml @@ -48,7 +48,7 @@