Fixing markers

Author: cmaughan

.zep/project.cfg

@@ -24,5 +24,6 @@ include = [
  "*.hpp",
  "*.txt",
  "*.cmake",
- "*.orca"
+"*.orca",
+"*.cfg"
 ]

include/zep/display.h

@@ -40,6 +40,7 @@ class ZepDisplay
     virtual uint32_t GetCodePointCount(const uint8_t* pCh, const uint8_t* pEnd) const;
     virtual NVec2f GetCharSize(const uint8_t* pChar);
     virtual const NVec2f& GetDefaultCharSize();
+    virtual const NVec2f& GetDotSize();
     virtual void InvalidateCharCache();
     virtual void DrawRect(const NRectf& rc, const NVec4f& col = NVec4f(1.0f)) const;
 
@@ -52,6 +53,7 @@ class ZepDisplay
     NVec2f m_charCacheASCII[256];
 
     NVec2f m_defaultCharSize;
+    NVec2f m_dotSize;
 };
 
 // A NULL renderer, used for testing

include/zep/window.h

@@ -172,7 +172,7 @@ class ZepWindow : public ZepComponent
     NVec2i BufferToDisplay(const GlyphIterator& location);
 
     void ScrollToCursor();
-    bool IsInsideTextRegion(NVec2i pos) const;
+    bool IsInsideVisibleText(NVec2i pos) const;
 
     enum class SpecialChar
     {

src/display.cpp

@@ -25,6 +25,12 @@ void ZepDisplay::BuildCharCache()
         m_charCacheASCII[i] = GetTextSize(&ch, &ch + 1);
     }
     m_charCacheDirty = false;
+    
+    m_dotSize = m_defaultCharSize / 8.0f;
+    m_dotSize.x = std::min(m_dotSize.x, m_dotSize.y);
+    m_dotSize.y = std::min(m_dotSize.x, m_dotSize.y);
+    m_dotSize.x = std::max(1.0f, m_dotSize.x);
+    m_dotSize.y = std::max(1.0f, m_dotSize.y);
 }
 
 const NVec2f& ZepDisplay::GetDefaultCharSize()
@@ -33,9 +39,15 @@ const NVec2f& ZepDisplay::GetDefaultCharSize()
     {
         BuildCharCache();
     }
+    
     return m_defaultCharSize;
 }
 
+const NVec2f& ZepDisplay::GetDotSize()
+{
+    return m_dotSize;
+}
+
 uint32_t ZepDisplay::GetCodePointCount(const uint8_t* pCh, const uint8_t* pEnd) const
 {
     uint32_t count = 0;

src/syntax.cpp

@@ -59,14 +59,6 @@ SyntaxResult ZepSyntax::GetSyntaxAt(const GlyphIterator& offset) const
         }
     }
 
-    if (!(m_flags & ZepSyntaxFlags::IgnoreLineHighlight))
-    {
-        if (offset.Index() >= m_activeLineRange.first && offset.Index() < (m_activeLineRange.second - 1))
-        {
-            result.background = ThemeColor::CursorLineBackground;
-        }
-    }
-
     if (m_flashRange.x != m_flashRange.y && m_flashRange.x <= offset.Index() && m_flashRange.y > offset.Index())
     {
         auto elapsed = timer_get_elapsed_seconds(m_flashTimer);

src/window.cpp

@@ -33,6 +33,8 @@ namespace Zep
 {
 
 const float ScrollBarSize = 17.0f;
+const float UnderlineMargin = 1.0f;
+
 ZepWindow::ZepWindow(ZepTabWindow& window, ZepBuffer* buffer)
     : ZepComponent(window.GetEditor())
     , m_tabWindow(window)
@@ -342,7 +344,7 @@ NVec2f ZepWindow::ArrangeLineMarkers(tRangeMarkers& markers)
 {
     // Account for markers
     auto margins = DPI_VEC2(GetEditor().GetConfig().widgetMargins);
-    auto underlineHeight = DPI_Y(GetEditor().GetConfig().underlineHeight) + DPI_Y(2.0f);
+    auto underlineHeight = DPI_Y(GetEditor().GetConfig().underlineHeight) + DPI_Y(UnderlineMargin * 2.0f);
     NVec2f height(0.0f);
 
     uint32_t lineWidgetCount = 0;
@@ -752,20 +754,37 @@ NRectf SquareRect(const NRectf& rc)
 
 void ZepWindow::DisplayLineBackground(SpanInfo& lineInfo, ZepSyntax* pSyntax)
 {
-    auto cursorCL = BufferToDisplay();
     auto& display = GetEditor().GetDisplay();
 
     auto widgetMargins = DPI_VEC2(GetEditor().GetConfig().widgetMargins);
     auto underlineHeight = DPI_Y(GetEditor().GetConfig().underlineHeight);
     auto inlineMargins = DPI_VEC2(GetEditor().GetConfig().inlineWidgetMargins);
-
     auto screenPosX = m_textRegion->rect.Left() + m_xPad;
-
     auto widgetMarkers = m_pBuffer->GetRangeMarkers(RangeMarkerType::Widget);
     auto itrWidgetMarkers = widgetMarkers.begin();
-
     auto tipTimeSeconds = timer_get_elapsed_seconds(m_toolTipTimer);
 
+    NVec2f linePx = GetSpanPixelRange(lineInfo);
+
+    if (lineInfo.lineByteRange.ContainsLocation(GetBufferCursor().Index()))
+    {
+        // Note; We fill below the line for underlines for now, to make them standout in minimal mode
+        display.DrawRectFilled(
+            NRectf(
+                NVec2f(linePx.x, ToWindowY(lineInfo.yOffsetPx)),
+                NVec2f(linePx.y, ToWindowY(lineInfo.yOffsetPx + lineInfo.FullLineHeightPx() + lineInfo.lineWidgetHeights.y))),
+            GetBlendedColor(ThemeColor::CursorLineBackground));
+    }
+    else
+    {
+        // Fill the background of the line
+        display.DrawRectFilled(
+            NRectf(
+                NVec2f(linePx.x, ToWindowY(lineInfo.yOffsetPx)),
+                NVec2f(linePx.y, ToWindowY(lineInfo.yOffsetPx + lineInfo.FullLineHeightPx() + lineInfo.lineWidgetHeights.y))),
+            GetBlendedColor(ThemeColor::Background));
+    }
+
     // Walk from the start of the line to the end of the line (in buffer chars)
     for (auto& cp : lineInfo.lineCodePoints)
     {
@@ -838,7 +857,8 @@ void ZepWindow::DisplayLineBackground(SpanInfo& lineInfo, ZepSyntax* pSyntax)
                     if (marker->displayType & RangeMarkerDisplayType::Underline)
                     {
                         float offset = lineInfo.yOffsetPx + lineInfo.FullLineHeightPx();
-                        offset += marker->displayRow * (DPI_Y(2.0f) + underlineHeight) + 1.0f; // Margins & an extra line to seperate from background highlight
+                        offset += marker->displayRow * (DPI_Y(UnderlineMargin * 2) + underlineHeight) + 1.0f; // Margins & an extra line to seperate from background highlight
+                        
                         display.DrawRectFilled(
                             NRectf(NVec2f(screenPosX, ToWindowY(offset)),
                                 NVec2f(screenPosX + cp.size.x, ToWindowY(offset + underlineHeight))),
@@ -894,13 +914,13 @@ void ZepWindow::DisplayLineNumbers()
     auto cursorCL = BufferToDisplay();
     auto& display = GetEditor().GetDisplay();
 
-    if (m_indicatorRegion->rect.Width() > 0)
+    if (m_numberRegion->rect.Width() > 0)
     {
         for (long windowLine = m_visibleLineIndices.x; windowLine < m_visibleLineIndices.y; windowLine++)
         {
             auto& lineInfo = *m_windowLines[windowLine];
 
-            if (!IsInsideTextRegion(NVec2i(0, lineInfo.spanLineIndex)))
+            if (!IsInsideVisibleText(NVec2i(0, lineInfo.spanLineIndex)))
                 return;
 
             auto cursorBufferLine = GetCursorLineInfo(cursorCL.y).bufferLineNumber;
@@ -959,6 +979,7 @@ void ZepWindow::DisplayLineNumbers()
     }
 }
 
+
 // TODO: This function draws one char at a time.  It could be more optimal at the expense of some
 // complexity.  Basically, I don't like the current implementation, but it works for now.
 // The text is displayed acorrding to the region bounds and the display lineData
@@ -967,50 +988,31 @@ bool ZepWindow::DisplayLine(SpanInfo& lineInfo, int displayPass)
 {
     static const auto blankSpace = ' ';
 
-    auto cursorCL = BufferToDisplay();
-    auto& display = GetEditor().GetDisplay();
-    display.SetClipRect(m_bufferRegion->rect);
-
     auto& buffer = GetBuffer();
     auto pMode = buffer.GetMode();
     if (!pMode)
     {
         return false;
     }
 
+    auto cursorCL = BufferToDisplay();
+    auto& display = GetEditor().GetDisplay();
     auto pSyntax = m_pBuffer->GetSyntax();
-
     auto cursorBlink = GetEditor().GetCursorBlinkState();
     auto cursorType = GetBuffer().GetMode()->GetCursorType();
-
-    auto defaultCharSize = GetEditor().GetDisplay().GetDefaultCharSize();
+    auto defaultCharSize = display.GetDefaultCharSize();
+    auto dotSize = display.GetDotSize();
     auto whiteSpaceCol = m_pBuffer->GetTheme().GetColor(ThemeColor::Whitespace);
-
     auto widgetMargins = DPI_VEC2(GetEditor().GetConfig().widgetMargins);
 
-    auto dotSize = defaultCharSize / 8.0f;
-    dotSize.x = std::min(dotSize.x, dotSize.y);
-    dotSize.y = std::min(dotSize.x, dotSize.y);
-    dotSize.x = std::max(1.0f, dotSize.x);
-    dotSize.y = std::max(1.0f, dotSize.y);
-
     // Drawing commands for the whole line
     if (displayPass == WindowPass::Background)
     {
         display.SetClipRect(m_textRegion->rect);
 
-        NVec2f linePx = GetSpanPixelRange(lineInfo);
-
-        // Fill the background of the line
-        // TODO: Adjust pixelRenderRange
-        display.DrawRectFilled(
-            NRectf(
-                NVec2f(linePx.x, ToWindowY(lineInfo.yOffsetPx)),
-                NVec2f(linePx.y, ToWindowY(lineInfo.yOffsetPx + lineInfo.FullLineHeightPx()))),
-            GetBlendedColor(ThemeColor::Background));
-
         DisplayLineBackground(lineInfo, pSyntax);
 
+        /*
         // Here we tell the syntax coloring about the active line
         if (pSyntax)
         {
@@ -1032,6 +1034,7 @@ bool ZepWindow::DisplayLine(SpanInfo& lineInfo, int displayPass)
                 }
             }
         }
+        */
     }
 
     display.SetClipRect(m_textRegion->rect);
@@ -1192,7 +1195,7 @@ bool ZepWindow::DisplayLine(SpanInfo& lineInfo, int displayPass)
     return true;
 }
 
-bool ZepWindow::IsInsideTextRegion(NVec2i pos) const
+bool ZepWindow::IsInsideVisibleText(NVec2i pos) const
 {
     if (pos.y < m_visibleLineIndices.x || pos.y >= m_visibleLineIndices.y)
     {

zep.cfg

@@ -3,7 +3,7 @@
 # Vertical Scroller: 0 = off, 1 = on if necessary, 2 = on always
 show_scrollbar = 0 
 
-# Style: Normal, or Minimal for a live-coding style of editor
+# Style: normal, or minimal for a live-coding style of editor
 style = "normal" 
 show_line_numbers = true
 show_indicator_region = true
@@ -15,3 +15,6 @@ line_margin_top = 1
 line_margin_bottom = 1
 widget_margin_top = 5
 widget_margin_bottom = 5
+
+background_fade_time = 20
+background_fade_wait = 5