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 6d96c0be..29338b01 100644 Binary files a/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x64 and b/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x64 differ diff --git a/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x86 b/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x86 index d8615172..f418dc69 100644 Binary files a/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x86 and b/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x86 differ 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 @@