Skip to content

Commit

Permalink
support for custom tab width
Browse files Browse the repository at this point in the history
  • Loading branch information
scheffle committed Feb 25, 2024
1 parent c77b851 commit 7f99220
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 2 deletions.
35 changes: 33 additions & 2 deletions vstgui/lib/ctexteditor.cpp
Expand Up @@ -111,6 +111,23 @@ inline Range makeRange (const STB_TexteditState& state)
return makeRange (state.select_start, state.select_end);
}

//------------------------------------------------------------------------
inline void replaceTabs (std::string& str, uint32_t tabWidth)
{
if (tabWidth < 1)
return;
std::string replaceStr;
while (--tabWidth)
replaceStr += ' ';
std::string::size_type pos = std::string::npos;
while ((pos = str.find_first_of ('\t')) != std::string::npos)
{
str[pos] = ' ';
str.replace (pos, 1, " ");
str.insert (pos, replaceStr);
}
}

using String = std::u16string;
using StringView = std::u16string_view;

Expand Down Expand Up @@ -867,7 +884,9 @@ void TextEditorView::drawRect (CDrawContext* context, const CRect& dirtyRect)
auto selX = x;
if (selRange.start != 0)
{
auto nonSelectedText = lt.getString ().substr (0, selRange.start);
auto t = md.model.text.substr (line.range.start, selRange.start);
auto nonSelectedText = convert (t);
replaceTabs (nonSelectedText, md.style->tabWidth);
selX += context->getStringWidth (nonSelectedText.data ());
}
CRect r (selX, y - md.fontAscent, selX, y + md.fontDescent);
Expand All @@ -876,7 +895,9 @@ void TextEditorView::drawRect (CDrawContext* context, const CRect& dirtyRect)
r.right = getViewSize ().right;
else
{
auto selectedText = lt.getString ().substr (selRange.start, selRange.length);
auto t = md.model.text.substr (line.range.start + selRange.start, selRange.length);
auto selectedText = convert (t);
replaceTabs (selectedText, md.style->tabWidth);
r.setWidth (context->getStringWidth (selectedText.data ()));
}
r.inset (0, -md.style->lineSpacing / 2.);
Expand Down Expand Up @@ -975,6 +996,7 @@ CRect TextEditorView::calculateCursorRect (int cursor) const
{
auto lineTextToCursor =
convert (md.model.text.data () + line.range.start, cursor - line.range.start);
replaceTabs (lineTextToCursor, md.style->tabWidth);
auto platformText = getPlatformFactory ().createString (lineTextToCursor.data ());
auto width = md.fontPainer->getStringWidth (nullptr, platformText);
r.offset (width, 0);
Expand Down Expand Up @@ -1237,6 +1259,7 @@ void TextEditorView::invalidate (Dirty what) const
CCoord TextEditorView::updateLineText (Lines::iterator& line) const
{
auto newText = convert (md.model.text.data () + line->range.start, line->range.length);
replaceTabs (newText, md.style->tabWidth);
if (newText != line->text)
{
line->text = std::move (newText);
Expand Down Expand Up @@ -1586,6 +1609,14 @@ float TextEditorView::getCharWidth (size_t row, size_t pos) const
UTF8String str (convert (&c, 1));
if (str[0] == '\n')
return STB_TEXTEDIT_GETWIDTH_NEWLINE;
bool isTab = str[0] == '\t';
if (isTab && md.style->tabWidth > 0)
{
str = " ";
auto tabWidth = md.style->tabWidth;
while (--tabWidth)
str += " ";
}
auto width = fontPainter->getStringWidth (nullptr, str.getPlatformString (), true);
return static_cast<float> (width / getGlobalTransform (true).m11);
}
Expand Down
1 change: 1 addition & 0 deletions vstgui/lib/ctexteditor.h
Expand Up @@ -61,6 +61,7 @@ struct ITextEditor
CCoord lineNumerLeftMargin {2.};
CCoord lineNumerRightMargin {2.};
uint32_t cursorBlinkTime {500}; // in milliseconds
uint32_t tabWidth {4};
bool showLineNumbers {true};
};

Expand Down
13 changes: 13 additions & 0 deletions vstgui/standalone/examples/standalone/source/testappdelegate.cpp
Expand Up @@ -226,6 +226,12 @@ class AppTextEditorController : public TextEditorControllerAdapter
std::for_each (textEditors.begin (), textEditors.end (),
[] (const auto& el) { el->resetController (); });
}
void setFonts (const SharedPointer<CFontDesc>& textFont,
const SharedPointer<CFontDesc>& lineNumbersFont)
{
style.font = textFont;
style.lineNumbersFont = lineNumbersFont;
}
void onTextEditorCreated (const ITextEditor& te) override
{
textEditors.emplace_back (&te);
Expand Down Expand Up @@ -422,6 +428,13 @@ Delegate::Delegate ()
void Delegate::finishLaunching ()
{
textEditorController = std::make_unique<AppTextEditorController> ();
#if MAC
auto font = makeOwned<CFontDesc> ("Menlo", 12);
textEditorController->setFonts (font, font);
#elif WINDOWS
auto font = makeOwned<CFontDesc> ("Consolas", 12);
textEditorController->setFonts (font, font);
#endif

model = std::make_shared<TestModel> ();
IApplication::instance ().registerCommand (Commands::NewDocument, 'n');
Expand Down

0 comments on commit 7f99220

Please sign in to comment.