From 576f0a53d04ec049875414ab6c0b8e2bf99108df Mon Sep 17 00:00:00 2001
From: scheffle <scheffle@users.noreply.github.com>
Date: Thu, 15 Feb 2024 15:05:22 +0100
Subject: [PATCH] add find panel to text editor

---
 vstgui/lib/CMakeLists.txt                     |   1 +
 vstgui/lib/ctexteditor.cpp                    | 581 +++++++++++++++++-
 vstgui/lib/ctexteditor.h                      |  16 +-
 vstgui/lib/enumbitset.h                       | 115 ++++
 .../standalone/source/testappdelegate.cpp     |   1 +
 vstgui/tests/unittest/CMakeLists.txt          |   1 +
 vstgui/tests/unittest/lib/enumbitset_test.cpp | 113 ++++
 .../editing/uiattributescontroller.cpp        |  11 +-
 8 files changed, 805 insertions(+), 34 deletions(-)
 create mode 100644 vstgui/lib/enumbitset.h
 create mode 100644 vstgui/tests/unittest/lib/enumbitset_test.cpp

diff --git a/vstgui/lib/CMakeLists.txt b/vstgui/lib/CMakeLists.txt
index 6397b2e1d..6ce971e4c 100644
--- a/vstgui/lib/CMakeLists.txt
+++ b/vstgui/lib/CMakeLists.txt
@@ -145,6 +145,7 @@ set(${target}_common_sources
     cvstguitimer.h
     dragging.h
     dispatchlist.h
+    enumbitset.h
     events.cpp
     events.h
     finally.h
diff --git a/vstgui/lib/ctexteditor.cpp b/vstgui/lib/ctexteditor.cpp
index d85a58617..139c1429f 100644
--- a/vstgui/lib/ctexteditor.cpp
+++ b/vstgui/lib/ctexteditor.cpp
@@ -17,6 +17,8 @@
 #include "platform/iplatformfont.h"
 #include "platform/iplatformframe.h"
 #include "platform/platformfactory.h"
+#include "controls/cbuttons.h"
+#include "controls/ctextedit.h"
 #include "animation/timingfunctions.h"
 #include "animation/animations.h"
 
@@ -134,10 +136,25 @@ struct NewLineProcessor
 };
 
 struct LineNumberView;
+struct FindPanelController;
 
 static constexpr CPoint MouseOutsidePos = {std::numeric_limits<CCoord>::max (),
 										   std::numeric_limits<CCoord>::max ()};
 
+//------------------------------------------------------------------------
+struct Key
+{
+	char16_t character;
+	VirtualKey virt;
+	Modifiers modifiers;
+
+	bool operator== (const KeyboardEvent& event) const
+	{
+		return event.character == character && event.virt == virt && event.modifiers == modifiers;
+	}
+};
+using CommandKeyArray = std::array<Key, static_cast<size_t> (ITextEditor::Command::TakeFocus) + 1>;
+
 //------------------------------------------------------------------------
 struct TextEditorView : public CView,
 						public ITextEditor,
@@ -218,6 +235,8 @@ struct TextEditorView : public CView,
 	bool handleCommand (Command cmd) const override;
 	bool setCommandKeyBinding (Command cmd, char16_t character, VirtualKey virt,
 							   Modifiers modifiers) const override;
+	void setFindOptions (FindOptions opt) const override;
+	void setFindString (std::string_view utf8Text) const override;
 
 	// commandos
 	void selectAll () const;
@@ -225,7 +244,11 @@ struct TextEditorView : public CView,
 	bool doCopy () const;
 	bool doPaste () const;
 	bool useSelectionForFind () const;
-	bool doFind (bool forward = true) const;
+	bool doFind (bool forward = true, size_t oldPos = String::npos) const;
+	bool showFindPanel () const;
+
+	String::size_type doFindCaseSensitive (bool forward) const;
+	String::size_type doFindIgnoreCase (bool forward) const;
 
 private:
 	template<typename Proc>
@@ -267,17 +290,21 @@ struct TextEditorView : public CView,
 	CRect invalidCursorRect () const;
 	void toggleCursorVisibility () const;
 	void restartBlinkTimer () const;
+	void onStyleChanged () const;
+	void setFindString (String&& text) const;
 
 	TextEditorView& mutableThis () const { return *const_cast<TextEditorView*> (this); }
 
+public:
 	//------------------------------------------------------------------------
-	mutable struct
+	struct ModelData
 	{
 		TextModel model;
 
 		std::shared_ptr<Style> style {std::make_shared<Style> ()};
 		ITextEditorController* controller {nullptr};
 		const IFontPainter* fontPainer {nullptr};
+		FindPanelController* findPanelController {nullptr};
 
 		CScrollView* scrollView {nullptr};
 		SharedPointer<LineNumberView> lineNumberView;
@@ -302,22 +329,14 @@ struct TextEditorView : public CView,
 
 		Lines::const_iterator stbInternalIterator;
 
+		FindOptions findOptions;
 		String findString;
 
-		struct Key
-		{
-			char16_t character;
-			VirtualKey virt;
-			Modifiers modifiers;
+		CommandKeyArray commandKeys;
+	};
 
-			bool operator== (const KeyboardEvent& event) const
-			{
-				return event.character == character && event.virt == virt &&
-					   event.modifiers == modifiers;
-			}
-		};
-		std::array<Key, static_cast<size_t> (Command::UseSelectionForFind) + 1> commandKeys;
-	} md;
+private:
+	mutable ModelData md;
 };
 
 #define VIRTUAL_KEY_BIT 0x80000000
@@ -393,6 +412,44 @@ struct LineNumberView : CView,
 	CView* textEditorView {nullptr};
 };
 
+//------------------------------------------------------------------------
+struct FindPanelController : IControlListener,
+							 ViewListenerAdapter,
+							 ViewEventListenerAdapter
+{
+	using RemoveFindPanelFunc = std::function<void ()>;
+	static CViewContainer* makeFindPanelView (CRect rect, TextEditorView::ModelData& md,
+											  const ITextEditor& editor, RemoveFindPanelFunc&& f);
+
+	void setFindString (StringView text);
+	void setFindOptions (ITextEditor::FindOptions opt);
+
+private:
+	enum Tag
+	{
+		Textfield,
+		CloseButton,
+		WholeWords,
+		CaseSensitive,
+		FindPrevious,
+		FindNext,
+	};
+
+	FindPanelController (const ITextEditor& editor);
+	~FindPanelController () noexcept;
+	void valueChanged (CControl* control) override;
+	void viewLostFocus (CView* view) override;
+	void viewWillDelete (CView* view) override;
+	void viewOnEvent (CView* view, Event& event) override;
+
+	const ITextEditor& editor;
+	CTextEdit* editfield {nullptr};
+	CControl* closeBox {nullptr};
+	ITextEditor::FindOptions findOptions {};
+	CommandKeyArray commandKeys;
+	RemoveFindPanelFunc removeFindPanelFunc;
+};
+
 static constexpr size_t Index (ITextEditor::Command cmd) { return static_cast<size_t> (cmd); }
 
 //------------------------------------------------------------------------
@@ -400,6 +457,7 @@ TextEditorView::TextEditorView (ITextEditorController* controller) : CView ({0,
 {
 	md.controller = controller;
 	setWantsFocus (true);
+	onStyleChanged ();
 	stb_textedit_initialize_state (&md.editState, false);
 	md.commandKeys[Index (Command::SelectAll)] = {u'a', VirtualKey::None, {ModifierKey::Control}};
 	md.commandKeys[Index (Command::Cut)] = {u'x', VirtualKey::None, {ModifierKey::Control}};
@@ -420,6 +478,8 @@ TextEditorView::TextEditorView (ITextEditorController* controller) : CView ({0,
 	md.commandKeys[Index (Command::UseSelectionForFind)] = {
 		0, VirtualKey::F3, {ModifierKey::Control}};
 #endif
+	md.commandKeys[Index (Command::ShowFindPanel)] = {
+		u'f', VirtualKey::None, {ModifierKey::Control}};
 	md.controller->onTextEditorCreated (*this);
 }
 
@@ -570,7 +630,9 @@ void TextEditorView::viewOnEvent (CView* view, Event& event)
 		scrollOffset.y -= wheelEvent.deltaY * md.lineHeight;
 	}
 	if (wheelEvent.flags & MouseWheelEvent::DirectionInvertedFromDevice)
-		scrollOffset.y *= 1.;
+	{
+		scrollOffset.y *= -1.;
+	}
 
 	auto viewSize = getVisibleViewSize ();
 	viewSize.offset (scrollOffset);
@@ -580,13 +642,8 @@ void TextEditorView::viewOnEvent (CView* view, Event& event)
 }
 
 //------------------------------------------------------------------------
-void TextEditorView::setStyle (const Style& newStyle) const
+void TextEditorView::onStyleChanged () const
 {
-	if (!md.style->font)
-		return;
-
-	md.style = std::make_shared<Style> (newStyle);
-
 	if (auto pf = md.style->font->getPlatformFont ())
 	{
 		md.fontAscent = pf->getAscent ();
@@ -625,11 +682,23 @@ void TextEditorView::setStyle (const Style& newStyle) const
 	invalidate (Dirty::All);
 }
 
+//------------------------------------------------------------------------
+void TextEditorView::setStyle (const Style& newStyle) const
+{
+	if (!md.style->font)
+		return;
+
+	md.style = std::make_shared<Style> (newStyle);
+	onStyleChanged ();
+}
+
 //------------------------------------------------------------------------
 bool TextEditorView::setPlainText (std::string_view utf8Text) const
 {
 	md.model.text = convert (utf8Text.data (), utf8Text.size ());
 	invalidate (Dirty::All);
+	if (md.lineNumberView)
+		updateLineNumbersView ();
 	return true;
 }
 
@@ -677,12 +746,16 @@ bool TextEditorView::canHandleCommand (Command cmd) const
 			// TODO:
 			return true;
 		}
+		case Command::TakeFocus:
+			return true;
 		case Command::FindNext:
 			[[fallthrough]];
 		case Command::FindPrevious:
 		{
 			return !md.findString.empty ();
 		}
+		case Command::ShowFindPanel:
+			return md.scrollView != nullptr;
 	}
 	return false;
 }
@@ -718,6 +791,17 @@ bool TextEditorView::handleCommand (Command cmd) const
 			return doFind (false);
 		case Command::UseSelectionForFind:
 			return useSelectionForFind ();
+		case Command::ShowFindPanel:
+			return showFindPanel ();
+		case Command::TakeFocus:
+		{
+			if (auto frame = getFrame ())
+			{
+				if (frame->getFocusView () != this)
+					frame->setFocusView (&mutableThis ());
+			}
+			return true;
+		}
 	}
 	return false;
 }
@@ -1896,17 +1980,72 @@ bool TextEditorView::useSelectionForFind () const
 {
 	if (auto range = makeRange (md.editState))
 	{
-		md.findString = md.model.text.substr (range.start, range.length);
+		setFindString (md.model.text.substr (range.start, range.length));
 		return true;
 	}
 	return false;
 }
 
 //------------------------------------------------------------------------
-bool TextEditorView::doFind (bool forward) const
+bool TextEditorView::doFind (bool forward, size_t oldPos) const
 {
 	if (md.findString.empty ())
 		return false;
+
+	std::optional<size_t> firstFound = {};
+
+	auto pos = String::npos;
+	while (true)
+	{
+		if (md.findOptions & FindOption::CaseSensitive)
+			pos = doFindCaseSensitive (forward);
+		else
+			pos = doFindIgnoreCase (forward);
+		if (pos == String::npos)
+			break;
+
+		auto oldCursor = md.editState.cursor;
+		md.editState.cursor = static_cast<int> (pos);
+		md.editState.select_start = md.editState.cursor;
+		md.editState.select_end = md.editState.cursor + static_cast<int> (md.findString.length ());
+
+		if (md.findOptions & FindOption::WholeWords)
+		{
+			if ((pos > 0 && !isStopChar (md.model.text[pos - 1])) ||
+				(pos + md.findString.length () < md.model.text.size () &&
+				 !isStopChar (md.model.text[pos + md.findString.length ()])))
+			{
+				if (firstFound)
+				{
+					if (pos == *firstFound)
+						break;
+				}
+				else
+				{
+					firstFound = {pos};
+				}
+				continue;
+			}
+		}
+
+		onCursorChanged (oldCursor, md.editState.cursor);
+		onSelectionChanged ({makeRange (md.editState)}, true);
+
+		return true;
+	}
+
+	if (md.editState.select_start != md.editState.select_end)
+	{
+		md.editState.select_end = md.editState.select_start;
+		onSelectionChanged ({makeRange (md.editState)}, true);
+	}
+
+	return false;
+}
+
+//------------------------------------------------------------------------
+String::size_type TextEditorView::doFindCaseSensitive (bool forward) const
+{
 	auto pos = String::npos;
 	if (forward)
 	{
@@ -1928,17 +2067,395 @@ bool TextEditorView::doFind (bool forward) const
 		if (pos == String::npos /*wrap around*/)
 			pos = text.rfind (md.findString.data (), pos);
 	}
-	if (pos != String::npos)
+	return pos;
+}
+
+//------------------------------------------------------------------------
+String::size_type TextEditorView::doFindIgnoreCase (bool forward) const
+{
+	auto pos = String::npos;
+	if (forward)
 	{
-		auto oldCursor = md.editState.cursor;
-		md.editState.cursor = static_cast<int> (pos);
-		md.editState.select_start = md.editState.cursor;
-		md.editState.select_end = md.editState.cursor + static_cast<int> (md.findString.length ());
-		onCursorChanged (oldCursor, md.editState.cursor);
-		onSelectionChanged ({makeRange (md.editState)}, true);
+		auto cursor = static_cast<size_t> (md.editState.select_end);
+		if (cursor > md.model.text.length ())
+			cursor = 0;
+
+		auto text = StringView (md.model.text.data () + cursor, md.model.text.length () - cursor);
+		auto it = std::search (
+			text.begin (), text.end (), md.findString.begin (), md.findString.end (),
+			[] (auto ch1, auto ch2) { return std::toupper (ch1) == std::toupper (ch2); });
+		if (it != text.end ())
+		{
+			pos = cursor + std::distance (text.begin (), it);
+		}
+		else if (cursor != 0) // wrap arround
+		{
+			text = StringView (md.model.text.data (), cursor);
+			it = std::search (
+				text.begin (), text.end (), md.findString.begin (), md.findString.end (),
+				[] (auto ch1, auto ch2) { return std::toupper (ch1) == std::toupper (ch2); });
+			if (it != text.end ())
+			{
+				pos = std::distance (text.begin (), it);
+			}
+		}
+	}
+	else
+	{
+		auto cursor = md.editState.select_start - md.findString.length ();
+		if (cursor < 0)
+			cursor = md.model.text.length ();
+		auto text = StringView (md.model.text.data (), cursor);
+		auto it = std::search (
+			text.rbegin (), text.rend (), md.findString.rbegin (), md.findString.rend (),
+			[] (auto ch1, auto ch2) { return std::toupper (ch1) == std::toupper (ch2); });
+		if (it != text.rend ())
+		{
+			pos = cursor - (std::distance (text.rbegin (), it) + md.findString.length ());
+		}
+		else if (cursor < md.model.text.length ()) // wrap arround
+		{
+			text = StringView (md.model.text.data () + cursor, md.model.text.length () - cursor);
+			it = std::search (
+				text.rbegin (), text.rend (), md.findString.rbegin (), md.findString.rend (),
+				[] (auto ch1, auto ch2) { return std::toupper (ch1) == std::toupper (ch2); });
+			if (it != text.rend ())
+			{
+				pos = (md.model.text.length () - md.findString.length ()) -
+					  std::distance (text.rbegin (), it);
+			}
+		}
+	}
+	return pos;
+}
+
+//------------------------------------------------------------------------
+FindPanelController::FindPanelController (const ITextEditor& editor) : editor (editor) {}
+
+//------------------------------------------------------------------------
+FindPanelController::~FindPanelController () noexcept
+{
+	if (closeBox)
+	{
+		closeBox->setListener (nullptr);
+		closeBox->unregisterViewListener (this);
+	}
+	if (editfield)
+	{
+		editfield->setListener (nullptr);
+		editfield->unregisterViewListener (this);
+	}
+}
+
+//------------------------------------------------------------------------
+void FindPanelController::valueChanged (CControl* control)
+{
+	switch (control->getTag ())
+	{
+		case FindPanelController::Textfield:
+		{
+			editor.setFindString (editfield->getText ().getString ());
+			break;
+		}
+		case FindPanelController::CloseButton:
+		{
+			removeFindPanelFunc ();
+			break;
+		}
+		case FindPanelController::FindPrevious:
+		{
+			if (control->getValue () != control->getMax ())
+				editor.handleCommand (ITextEditor::Command::FindPrevious);
+			break;
+		}
+		case FindPanelController::FindNext:
+		{
+			if (control->getValue () != control->getMax ())
+				editor.handleCommand (ITextEditor::Command::FindNext);
+			break;
+		}
+		case FindPanelController::CaseSensitive:
+		{
+			if (control->getValue () == control->getMax ())
+				findOptions.add (ITextEditor::FindOption::CaseSensitive);
+			else
+				findOptions.remove (ITextEditor::FindOption::CaseSensitive);
+			editor.setFindOptions (findOptions);
+			break;
+		}
+		case FindPanelController::WholeWords:
+		{
+			if (control->getValue () == control->getMax ())
+				findOptions.add (ITextEditor::FindOption::WholeWords);
+			else
+				findOptions.remove (ITextEditor::FindOption::WholeWords);
+			editor.setFindOptions (findOptions);
+			break;
+		}
+	}
+}
+
+//------------------------------------------------------------------------
+void FindPanelController::viewLostFocus (CView* view)
+{
+	if (view == editfield)
+	{
+		editor.setFindString (editfield->getText ().getString ());
+		if (editfield->bWasReturnPressed)
+		{
+			editor.handleCommand (ITextEditor::Command::TakeFocus);
+			editfield->bWasReturnPressed = false;
+		}
+	}
+}
+
+//------------------------------------------------------------------------
+void FindPanelController::viewOnEvent (CView* view, Event& event)
+{
+	if (event.type == EventType::KeyDown)
+	{
+		auto& keyEvent = castKeyboardEvent (event);
+		if (keyEvent.virt == VirtualKey::Escape)
+		{
+			removeFindPanelFunc ();
+			event.consumed = true;
+		}
+		else if (commandKeys[Index (ITextEditor::Command::FindNext)] == keyEvent)
+		{
+			editor.handleCommand (ITextEditor::Command::FindNext);
+			event.consumed = true;
+		}
+		else if (commandKeys[Index (ITextEditor::Command::FindPrevious)] == keyEvent)
+		{
+			editor.handleCommand (ITextEditor::Command::FindPrevious);
+			event.consumed = true;
+		}
+	}
+}
+
+//------------------------------------------------------------------------
+void FindPanelController::viewWillDelete (CView* view)
+{
+	view->unregisterViewListener (this);
+	if (view == closeBox)
+		closeBox = nullptr;
+	else if (view == editfield)
+		editfield = nullptr;
+	else if (view->asViewContainer ())
+		delete this;
+}
+
+//------------------------------------------------------------------------
+void FindPanelController::setFindString (StringView text)
+{
+	if (editfield)
+		editfield->setText (convert (text.data (), text.size ()).data ());
+}
+
+//------------------------------------------------------------------------
+void FindPanelController::setFindOptions (ITextEditor::FindOptions opt) { findOptions = opt; }
+
+//------------------------------------------------------------------------
+CViewContainer* FindPanelController::makeFindPanelView (CRect vcr, TextEditorView::ModelData& md,
+														const ITextEditor& editor,
+														RemoveFindPanelFunc&& f)
+{
+	auto controller = new FindPanelController (editor);
+	controller->removeFindPanelFunc = std::move (f);
+	controller->commandKeys = md.commandKeys;
+	controller->setFindOptions (md.findOptions);
+
+	auto margin = (vcr.getHeight () - md.lineHeight) / 2.;
+	vcr.inset (margin, margin);
+	auto buttonWidth = vcr.getHeight ();
+
+	CViewContainer* findPanel = new CViewContainer (vcr);
+	findPanel->setTransparency (true);
+	auto tefr = vcr;
+	tefr.left += buttonWidth + margin;
+	tefr.right -= 6. * (buttonWidth + margin) + margin;
+	CTextEdit* editfield = new CTextEdit (tefr, controller, FindPanelController::Textfield);
+	editfield->setPlaceholderString ("Find");
+	editfield->setTextInset ({margin, 0});
+	editfield->setImmediateTextChange (true);
+	editfield->setAutosizeFlags (kAutosizeLeft | kAutosizeRight | kAutosizeTop);
+	editfield->setHoriAlign (kLeftText);
+	editfield->setFrameColor (md.style->frameColor);
+	editfield->setFrameWidth (-1.);
+	editfield->setBackColor (md.style->backColor);
+	editfield->setFont (md.style->font);
+	editfield->setFontColor (md.style->textColor);
+	editfield->registerViewEventListener (controller);
+
+	auto styleButton = [&] (CTextButton* button) {
+		button->setFont (md.style->font);
+		button->setAutosizeFlags (kAutosizeTop | kAutosizeRight);
+		button->setFrameWidth (1.);
+		button->setRoundRadius (2.);
+		auto gradient =
+			owned (CGradient::create (0., 1., md.style->backColor, md.style->backColor));
+		button->setGradient (gradient);
+		auto isOnOffStyle = button->getStyle () == CTextButton::Style::kOnOffStyle;
+		if (isOnOffStyle)
+			gradient = owned (CGradient::create (0., 1., md.style->textColor, md.style->textColor));
+		button->setGradientHighlighted (gradient);
+		button->setTextColor (md.style->textColor);
+		auto color = md.style->frameColor;
+		color.alpha /= 2;
+		button->setTextColorHighlighted (isOnOffStyle ? md.style->backColor : md.style->textColor);
+		button->setFrameColor (md.style->frameColor);
+		button->setFrameColorHighlighted (color);
+	};
+
+	auto cbfr = vcr;
+	cbfr.right = tefr.left - margin;
+	auto closeBox = new CTextButton (cbfr, controller, FindPanelController::CloseButton);
+	closeBox->setTitle ("X");
+	styleButton (closeBox);
+	closeBox->setAutosizeFlags (kAutosizeLeft | kAutosizeTop);
+
+	auto icfr = tefr;
+	icfr.left = tefr.right + margin;
+	icfr.right = icfr.left + buttonWidth * 2;
+	auto caseSensitiveButton =
+		new CTextButton (icfr, controller, FindPanelController::CaseSensitive);
+	caseSensitiveButton->setTitle ("Aa");
+	caseSensitiveButton->setStyle (CTextButton::Style::kOnOffStyle);
+	caseSensitiveButton->setValue (md.findOptions & ITextEditor::FindOption::CaseSensitive ? 1.f
+																						   : 0.f);
+	styleButton (caseSensitiveButton);
+	icfr.offset (margin + buttonWidth * 2, 0);
+	auto wholeWordButton = new CTextButton (icfr, controller, FindPanelController::WholeWords);
+	wholeWordButton->setTitle ("|w|");
+	wholeWordButton->setStyle (CTextButton::Style::kOnOffStyle);
+	wholeWordButton->setValue (md.findOptions & ITextEditor::FindOption::WholeWords ? 1.f : 0.f);
+	styleButton (wholeWordButton);
+
+	auto tbfr = icfr;
+	tbfr.left = tbfr.right + margin;
+	tbfr.right = tbfr.left + buttonWidth;
+	auto prevButton = new CTextButton (tbfr, controller, FindPanelController::FindPrevious);
+	prevButton->setTitle ("<");
+	styleButton (prevButton);
+	tbfr.offset (margin + buttonWidth, 0);
+	auto nextButton = new CTextButton (tbfr, controller, FindPanelController::FindNext);
+	nextButton->setTitle (">");
+	styleButton (nextButton);
+
+	editfield->registerViewListener (controller);
+	closeBox->registerViewListener (controller);
+	findPanel->registerViewListener (controller);
+
+	controller->editfield = editfield;
+	controller->closeBox = closeBox;
+
+	findPanel->addView (closeBox);
+	findPanel->addView (editfield);
+	findPanel->addView (caseSensitiveButton);
+	findPanel->addView (wholeWordButton);
+	findPanel->addView (prevButton);
+	findPanel->addView (nextButton);
+	findPanel->setInitialFocusView (editfield);
+
+	controller->setFindString (md.findString);
+	md.findPanelController = controller;
+
+	return findPanel;
+}
+
+//------------------------------------------------------------------------
+bool TextEditorView::showFindPanel () const
+{
+	if (!md.scrollView)
+		return false;
+	if (auto view = md.scrollView->getEdgeView (CScrollView::Edge::Top))
+	{
+		if (auto frame = getFrame ())
+		{
+			if (auto container = view->asViewContainer ())
+				container->advanceNextFocusView (nullptr);
+			else
+				frame->setFocusView (view);
+		}
 		return true;
 	}
-	return false;
+	auto margin = 3.;
+
+	auto vcr = md.scrollView->getVisibleClientRect ();
+	vcr.originize ();
+	vcr.setHeight (md.lineHeight + margin * 2);
+
+	using namespace Animation;
+	auto findPanel = FindPanelController::makeFindPanelView (vcr, md, *this, [&] () {
+		md.findPanelController = nullptr;
+		if (auto panel = md.scrollView->getEdgeView (CScrollView::Edge::Top))
+		{
+			auto size = panel->getViewSize ();
+			size.setHeight (1.);
+			if (auto frame = panel->getFrame ())
+				frame->setFocusView (nullptr);
+			panel->addAnimation (
+				"ResizeAnimation", new ViewSizeAnimation (size, false),
+				CubicBezierTimingFunction::make (CubicBezierTimingFunction::EasyInOut, 120),
+				[&] (auto, auto, auto) {
+					md.scrollView->setEdgeView (CScrollView::Edge::Top, nullptr);
+					handleCommand (Command::TakeFocus);
+				});
+		}
+	});
+	auto initRect = vcr;
+	initRect.setHeight (1.);
+	findPanel->setViewSize (initRect);
+	md.scrollView->setEdgeView (CScrollView::Edge::Top, findPanel);
+
+	if (auto frame = getFrame ())
+		frame->setFocusView (nullptr);
+	findPanel->addAnimation (
+		"ResizeAnimation", new ViewSizeAnimation (vcr, false),
+		CubicBezierTimingFunction::make (CubicBezierTimingFunction::EasyInOut, 120),
+		[panel = shared (findPanel)] (auto, auto, auto) {
+			if (panel->isAttached ())
+				panel->advanceNextFocusView (nullptr);
+		});
+	return true;
+}
+
+//------------------------------------------------------------------------
+void TextEditorView::setFindOptions (FindOptions opt) const
+{
+	md.findOptions = opt;
+	if (md.findPanelController)
+	{
+		md.findPanelController->setFindOptions (md.findOptions);
+		md.editState.select_end = md.editState.select_start;
+		onSelectionChanged (makeRange (md.editState));
+		doFind ();
+	}
+}
+
+//------------------------------------------------------------------------
+void TextEditorView::setFindString (std::string_view utf8Text) const
+{
+	setFindString (convert (utf8Text.data (), utf8Text.size ()));
+}
+
+//------------------------------------------------------------------------
+void TextEditorView::setFindString (String&& text) const
+{
+	md.findString = std::move (text);
+	if (auto frame = getFrame ())
+	{
+		if (frame->getFocusView () != this)
+		{
+			md.editState.select_end = md.editState.select_start;
+			onSelectionChanged (makeRange (md.editState));
+			doFind ();
+		}
+		else if (md.findPanelController)
+		{
+			md.findPanelController->setFindString (md.findString);
+		}
+	}
 }
 
 //------------------------------------------------------------------------
diff --git a/vstgui/lib/ctexteditor.h b/vstgui/lib/ctexteditor.h
index 49bcecffb..8587bf7cf 100644
--- a/vstgui/lib/ctexteditor.h
+++ b/vstgui/lib/ctexteditor.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "enumbitset.h"
 #include "cview.h"
 #include "ccolor.h"
 #include <string_view>
@@ -51,6 +52,7 @@ struct ITextEditor
 		CColor textColor {kBlackCColor};
 		CColor backColor {kWhiteCColor};
 		CColor selectionBackColor {kGreyCColor};
+		CColor frameColor {kGreyCColor};
 		CColor lineNumberTextColor {127, 127, 127, 100};
 		CColor lineNumberTextSelectedColor {100, 100, 100, 255};
 		CColor lineNumberLine {127, 127, 127, 100};
@@ -64,7 +66,7 @@ struct ITextEditor
 
 	virtual void setStyle (const Style& style) const = 0;
 
-	enum class Command
+	enum class Command : uint32_t
 	{
 		Undo,
 		Redo,
@@ -75,12 +77,24 @@ struct ITextEditor
 		FindPrevious,
 		SelectAll,
 		UseSelectionForFind,
+		ShowFindPanel,
+		TakeFocus,
 	};
 
 	virtual bool canHandleCommand (Command cmd) const = 0;
 	virtual bool handleCommand (Command cmd) const = 0;
 	virtual bool setCommandKeyBinding (Command cmd, char16_t character, VirtualKey virt,
 									   Modifiers modifiers) const = 0;
+
+	enum class FindOption : uint32_t
+	{
+		CaseSensitive,
+		WholeWords,
+	};
+	using FindOptions = EnumBitset<FindOption>;
+
+	virtual void setFindOptions (FindOptions opt) const = 0;
+	virtual void setFindString (std::string_view utf8Text) const = 0;
 };
 
 //------------------------------------------------------------------------
diff --git a/vstgui/lib/enumbitset.h b/vstgui/lib/enumbitset.h
new file mode 100644
index 000000000..7dfa32e4f
--- /dev/null
+++ b/vstgui/lib/enumbitset.h
@@ -0,0 +1,115 @@
+// This file is part of VSTGUI. It is subject to the license terms
+// in the LICENSE file found in the top-level directory of this
+// distribution and at http://github.com/steinbergmedia/vstgui/LICENSE
+
+#pragma once
+
+#include <initializer_list>
+#include <type_traits>
+
+//------------------------------------------------------------------------
+namespace VSTGUI {
+
+//------------------------------------------------------------------------
+/** enum class bitset
+ *
+ *	example:
+ *
+ *		enum class Flag {
+ *			One,
+ *			Two,
+ *			Three
+ *		};
+ *		using Flags = EnumBitset<Flag>;
+ *		Flags f;
+ *		f = Flag::One
+ *		f |= Flag::Two;
+ *		if (f & Flag::One) {}
+ *
+ */
+template<typename Enum>
+struct EnumBitset
+{
+	using value_type = std::underlying_type_t<Enum>;
+
+	constexpr EnumBitset () {}
+	constexpr EnumBitset (Enum initialValue) { exlusive (initialValue); }
+	constexpr EnumBitset (const std::initializer_list<Enum>& list)
+	{
+		for (auto& v : list)
+			add (v);
+	}
+	explicit constexpr EnumBitset (value_type v) : val (v) {}
+
+	constexpr EnumBitset (const EnumBitset&) = default;
+	constexpr EnumBitset& operator= (const EnumBitset&) = default;
+
+	constexpr void exlusive (Enum e) { val = to_value_type (e); }
+	constexpr void add (Enum e) { val |= to_value_type (e); }
+	constexpr void remove (Enum e) { val &= ~to_value_type (e); }
+	constexpr void clear () { val = {}; }
+
+	constexpr bool test (Enum e) const { return (val & to_value_type (e)) != 0; }
+	constexpr bool empty () const { return val == 0; }
+
+	constexpr EnumBitset& operator= (Enum e)
+	{
+		exlusive (e);
+		return *this;
+	}
+	constexpr EnumBitset& operator|= (Enum e)
+	{
+		add (e);
+		return *this;
+	}
+	constexpr EnumBitset& operator^= (Enum e)
+	{
+		remove (e);
+		return *this;
+	}
+	constexpr EnumBitset& operator&= (const EnumBitset& other)
+	{
+		val &= other.value;
+		return *this;
+	}
+	constexpr EnumBitset& operator<< (Enum e)
+	{
+		add (e);
+		return *this;
+	}
+	constexpr EnumBitset& operator<< (const EnumBitset& other)
+	{
+		val |= other.val;
+		return *this;
+	}
+	constexpr EnumBitset& operator>> (Enum e)
+	{
+		remove (e);
+		return *this;
+	}
+	constexpr EnumBitset& operator>> (const EnumBitset& other)
+	{
+		val &= ~other.val;
+		return *this;
+	}
+
+	[[nodiscard]] constexpr EnumBitset operator| (Enum e) const
+	{
+		auto v = *this;
+		v.add (e);
+		return v;
+	}
+	constexpr bool operator& (Enum e) const { return test (e); }
+	constexpr bool operator== (const EnumBitset& other) const { return val == other.val; }
+	constexpr bool operator!= (const EnumBitset& other) const { return val != other.val; }
+
+	constexpr value_type value () const { return val; }
+
+private:
+	constexpr value_type to_value_type (Enum e) const { return 1 << static_cast<value_type> (e); }
+
+	value_type val {};
+};
+
+//------------------------------------------------------------------------
+} // VSTGUI
diff --git a/vstgui/standalone/examples/standalone/source/testappdelegate.cpp b/vstgui/standalone/examples/standalone/source/testappdelegate.cpp
index 8a78ccbd9..2c8954296 100644
--- a/vstgui/standalone/examples/standalone/source/testappdelegate.cpp
+++ b/vstgui/standalone/examples/standalone/source/testappdelegate.cpp
@@ -216,6 +216,7 @@ class AppTextEditorController : public TextEditorControllerAdapter
 		style.selectionBackColor = MakeCColor (120, 120, 255, 150);
 		style.backColor = MakeCColor (255, 255, 255, 220);
 		style.textColor = kBlackCColor;
+		style.frameColor = kBlackCColor; // MakeCColor (50, 50, 50, 200);
 		style.font = makeOwned<CFontDesc> (*kNormalFont);
 		style.lineNumbersFont = makeOwned<CFontDesc> (*kNormalFontSmall);
 		style.lineSpacing = 0.;
diff --git a/vstgui/tests/unittest/CMakeLists.txt b/vstgui/tests/unittest/CMakeLists.txt
index 5c7e2fb71..0428f6a53 100644
--- a/vstgui/tests/unittest/CMakeLists.txt
+++ b/vstgui/tests/unittest/CMakeLists.txt
@@ -35,6 +35,7 @@ set(${target}_sources
 	"${VSTGUI_TEST_BASE}lib/csplitview_test.cpp"
 	"${VSTGUI_TEST_BASE}lib/cview_test.cpp"
 	"${VSTGUI_TEST_BASE}lib/cviewcontainer_test.cpp"
+	"${VSTGUI_TEST_BASE}lib/enumbitset_test.cpp"
 	"${VSTGUI_TEST_BASE}lib/event_test.cpp"
 	"${VSTGUI_TEST_BASE}lib/eventhelpers.h"
 	"${VSTGUI_TEST_BASE}lib/idependency_test.cpp"
diff --git a/vstgui/tests/unittest/lib/enumbitset_test.cpp b/vstgui/tests/unittest/lib/enumbitset_test.cpp
new file mode 100644
index 000000000..2f4c21bea
--- /dev/null
+++ b/vstgui/tests/unittest/lib/enumbitset_test.cpp
@@ -0,0 +1,113 @@
+// This file is part of VSTGUI. It is subject to the license terms
+// in the LICENSE file found in the top-level directory of this
+// distribution and at http://github.com/steinbergmedia/vstgui/LICENSE
+
+#include "../../../lib/enumbitset.h"
+#include "../unittests.h"
+
+//------------------------------------------------------------------------
+namespace VSTGUI {
+
+//------------------------------------------------------------------------
+enum class Flag
+{
+	One,
+	Two,
+	Three,
+};
+using Flags = EnumBitset<Flag>;
+
+//------------------------------------------------------------------------
+TEST_CASE (EnumBitsetTest, InitTest)
+{
+	{
+		Flags f;
+		EXPECT_EQ (f.value (), 0);
+	}
+	{
+		Flags f (Flag::Two);
+		EXPECT_EQ (f.value (), 2);
+	}
+	{
+		Flags f ({Flag::One, Flag::Two});
+		EXPECT_EQ (f.value (), 3);
+	}
+}
+
+//------------------------------------------------------------------------
+TEST_CASE (EnumBitsetTest, AssignmentTest)
+{
+	Flags f;
+	f = Flag::One;
+	EXPECT_EQ (f.value (), 1);
+
+	Flags f2 = Flag::Two;
+	EXPECT_EQ (f2.value (), 2);
+
+	f = f2;
+	EXPECT_EQ (f.value (), f2.value ());
+
+	f2.exlusive (Flag::Three);
+	EXPECT_EQ (f2.value (), 4);
+}
+
+//------------------------------------------------------------------------
+TEST_CASE (EnumBitsetTest, AddRemoveTest)
+{
+	Flags f;
+	f.add (Flag::One);
+	EXPECT_EQ (f.value (), 1);
+	f.add (Flag::Two);
+	EXPECT_EQ (f.value (), 3);
+	f.remove (Flag::One);
+	EXPECT_EQ (f.value (), 2);
+
+	f.clear ();
+
+	f |= Flag::One;
+	EXPECT_EQ (f.value (), 1);
+	f |= Flag::Two;
+	EXPECT_EQ (f.value (), 3);
+
+	f ^= Flag::One;
+	EXPECT_EQ (f.value (), 2);
+
+	f.clear ();
+
+	f << Flag::One;
+	EXPECT_EQ (f.value (), 1);
+	f << Flag::Two;
+	EXPECT_EQ (f.value (), 3);
+	f >> Flag::One;
+	EXPECT_EQ (f.value (), 2);
+}
+
+//------------------------------------------------------------------------
+TEST_CASE (EnumBitsetTest, OperatorTest)
+{
+	Flags f1 = Flag::One;
+	Flags f2 ({Flag::Two, Flag::Three});
+
+	auto f3 = f1 | Flag::Two;
+	EXPECT_EQ (f3.value (), 3);
+
+	EXPECT_TRUE (f3 & Flag::One);
+	EXPECT_TRUE (f3 & Flag::Two);
+}
+
+//------------------------------------------------------------------------
+TEST_CASE (EnumBitsetTest, EqualityTest)
+{
+	Flags f1 ({Flag::One, Flag::Three});
+	Flags f2 ({Flag::Two, Flag::Three});
+	Flags f3 ({Flag::Three, Flag::One});
+
+	EXPECT_TRUE (f1 != f2);
+	EXPECT_TRUE (f1 == f3);
+
+	EXPECT_TRUE (f1.test (Flag::One));
+	EXPECT_FALSE (f1.test (Flag::Two));
+}
+
+//------------------------------------------------------------------------
+} // VSTGUI
diff --git a/vstgui/uidescription/editing/uiattributescontroller.cpp b/vstgui/uidescription/editing/uiattributescontroller.cpp
index c5674bbb5..4ad9a1c13 100644
--- a/vstgui/uidescription/editing/uiattributescontroller.cpp
+++ b/vstgui/uidescription/editing/uiattributescontroller.cpp
@@ -21,6 +21,7 @@
 #include "../../lib/cstring.h"
 #include "../../lib/cgraphicspath.h"
 #include "../../lib/ctexteditor.h"
+#include "../../lib/cvstguitimer.h"
 #include <sstream>
 #include <algorithm>
 #include <cassert>
@@ -456,6 +457,7 @@ class ScriptController : public TextController,
 					description->getColor ("control.font", style.textColor);
 					description->getColor ("control.frame", style.selectionBackColor);
 					description->getColor ("control.frame", style.lineNumberTextColor);
+					description->getColor ("control.frame", style.frameColor);
 					if (auto font = description->getFont ("scripteditor.font"))
 					{
 						style.font = font;
@@ -475,7 +477,14 @@ class ScriptController : public TextController,
 	void onDialogButton2Clicked (UIDialogController*) override {}
 	void onDialogShow (UIDialogController*) override {}
 
-	void onTextEditorCreated (const ITextEditor& te) override { textEditor = &te; }
+	void onTextEditorCreated (const ITextEditor& te) override
+	{
+		textEditor = &te;
+		Call::later ([This = shared (this)] () {
+			if (This->textEditor)
+				This->textEditor->handleCommand (ITextEditor::Command::TakeFocus);
+		});
+	}
 
 	void onTextEditorDestroyed (const ITextEditor& te) override
 	{