From 3c299ad2c62f5f5affacbb241c77fa70fdf93d01 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 26 Apr 2020 08:58:07 +0000
Subject: [PATCH] RichEdit: Current style now preset in style manager

git-svn-id: svn://ultimatepp.org/upp/trunk@14389 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/RichEdit/FormatDlg.cpp  | 3 ++-
 uppsrc/RichEdit/ParaFormat.cpp | 2 +-
 uppsrc/RichEdit/RichEdit.h     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/uppsrc/RichEdit/FormatDlg.cpp b/uppsrc/RichEdit/FormatDlg.cpp
index 523dbd601..8328b84ad 100644
--- a/uppsrc/RichEdit/FormatDlg.cpp
+++ b/uppsrc/RichEdit/FormatDlg.cpp
@@ -454,7 +454,7 @@ void RichEdit::DisplayDefault::Paint(Draw& w, const Rect& r, const Value& q, Col
 	DrawSmartText(w, r.left, r.top, r.Width(), text, StdFont().Bold(), ink);
 }
 
-void StyleManager::Set(const RichText& text)
+void StyleManager::Set(const RichText& text, const Uuid& current)
 {
 	list.Clear();
 	int i;
@@ -469,6 +469,7 @@ void StyleManager::Set(const RichText& text)
 	if(q >= 0)
 		list.SetDisplay(q, 0, Single<RichEdit::DisplayDefault>());
 	ReloadNextStyles();
+	list.FindSetCursor(current);
 }
 
 void StyleManager::Set(const char *qtf)
diff --git a/uppsrc/RichEdit/ParaFormat.cpp b/uppsrc/RichEdit/ParaFormat.cpp
index ce7e1a2ae..547f3c5ee 100644
--- a/uppsrc/RichEdit/ParaFormat.cpp
+++ b/uppsrc/RichEdit/ParaFormat.cpp
@@ -112,7 +112,7 @@ void RichEdit::Styles()
 	NextUndo();
 	StyleManager s;
 	s.Setup(ffs, unit);
-	s.Set(text);
+	s.Set(text, formatinfo.styleid);
 	if(s.Execute() != IDOK || !s.IsChanged())
 		return;
 	SaveStylesUndo();
diff --git a/uppsrc/RichEdit/RichEdit.h b/uppsrc/RichEdit/RichEdit.h
index e990fdb2f..dd17deb5a 100644
--- a/uppsrc/RichEdit/RichEdit.h
+++ b/uppsrc/RichEdit/RichEdit.h
@@ -185,7 +185,7 @@ private:
 	typedef StyleManager CLASSNAME;
 
 public:
-	void     Set(const RichText& text);
+	void     Set(const RichText& text, const Uuid& current = Null);
 	void     Set(const char *qtf);
 	bool     IsChanged() const;
 	void     Get(RichText& text);