Added quote indicator preference

Also, added a command that gets posted when the mouse exits or enters the window area. This lets the hover outline to be updated accordingly.

4 files changed, 28 insertions, 2 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 558c320d..8d3716a6 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1234,6 +1234,10 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         refresh_Widget(w);
         updateWindowTitle_DocumentWidget_(d);
     }
+    else if (equal_Command(cmd, "window.mouse.exited")) {
+        updateOutlineOpacity_DocumentWidget_(d);
+        return iFalse;
+    }
     else if (equal_Command(cmd, "theme.changed") && document_App() == d) {
         updateTheme_DocumentWidget_(d);
         invalidate_DocumentWidget_(d);
@@ -2116,7 +2120,6 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
     }
     else if (run->audioId) {
         /* Audio player UI is drawn afterwards as a dynamic overlay. */
-        //fillRect_Paint(&d->paint, moved_Rect(run->visBounds, origin), red_ColorId);
         return;
     }
     enum iColorId      fg  = run->color;
@@ -2181,6 +2184,12 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                 goto runDrawn;
             }
         }
+        if (run->flags & quoteBorder_GmRunFlag) {
+            drawVLine_Paint(&d->paint,
+                            addX_I2(visPos, -gap_Text * 5 / 2),
+                            height_Rect(run->visBounds),
+                            tmQuoteIcon_ColorId);
+        }
         drawRange_Text(run->font, visPos, fg, run->text);
 //        printf("{%s}\n", cstr_Rangecc(run->text));
     runDrawn:;
diff --git a/src/ui/util.c b/src/ui/util.c
index 35eea9c3..bef839dc 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -991,6 +991,12 @@ iWidget *makePreferences_Widget(void) {
             addRadioButton_(widths, "prefs.linewidth.1000", "Window", "linewidth.set arg:1000");
         }
         addChildFlags_Widget(values, iClob(widths), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
+        addChild_Widget(headings, iClob(makeHeading_Widget("Quote indicator:")));
+        iWidget *quote = new_Widget(); {
+            addRadioButton_(quote, "prefs.quoteicon.1", "Icon", "quoteicon.set arg:1");
+            addRadioButton_(quote, "prefs.quoteicon.0", "Line", "quoteicon.set arg:0");
+        }
+        addChildFlags_Widget(values, iClob(quote), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
         addChild_Widget(headings, iClob(makeHeading_Widget("Big 1st paragaph:")));
         addChild_Widget(values, iClob(makeToggle_Widget("prefs.biglede")));
         makeTwoColumnHeading_("WIDE LAYOUT", headings, values);
diff --git a/src/ui/window.c b/src/ui/window.c
index 40215506..c5194ea0 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -524,6 +524,7 @@ void init_Window(iWindow *d, iRect rect) {
     d->lastRect = rect;
     d->pendingCursor = NULL;
     d->isDrawFrozen = iTrue;
+    d->isMouseInside = iTrue;
     uint32_t flags = 0;
 #if defined (iPlatformApple)
     SDL_SetHint(SDL_HINT_RENDER_DRIVER, shouldDefaultToMetalRenderer_MacOS() ? "metal" : "opengl");
@@ -543,7 +544,7 @@ void init_Window(iWindow *d, iRect rect) {
     if (left_Rect(rect) >= 0 || top_Rect(rect) >= 0) {
         SDL_SetWindowPosition(d->win, left_Rect(rect), top_Rect(rect));
     }
-    const iInt2 minSize = init_I2(425, 250);
+    const iInt2 minSize = init_I2(425, 300);
     SDL_SetWindowMinimumSize(d->win, minSize.x, minSize.y);
     SDL_SetWindowTitle(d->win, "Lagrange");
     /* Some info. */ {
@@ -655,6 +656,12 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
             return iTrue;
         case SDL_WINDOWEVENT_LEAVE:
             unhover_Widget();
+            d->isMouseInside = iFalse;
+            postCommand_App("window.mouse.exited");
+            return iTrue;
+        case SDL_WINDOWEVENT_ENTER:
+            d->isMouseInside = iTrue;
+            postCommand_App("window.mouse.entered");
             return iTrue;
         default:
             break;
@@ -812,6 +819,9 @@ iInt2 coord_Window(const iWindow *d, int x, int y) {
 }
 
 iInt2 mouseCoord_Window(const iWindow *d) {
+    if (!d->isMouseInside) {
+        return init_I2(-1000000, -1000000);
+    }
     int x, y;
     SDL_GetMouseState(&x, &y);
     return coord_Window(d, x, y);
diff --git a/src/ui/window.h b/src/ui/window.h
index da4a2123..3ede1578 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -37,6 +37,7 @@ struct Impl_Window {
     iInt2         initialPos;
     iRect         lastRect; /* updated when window is moved/resized */
     iBool         isDrawFrozen; /* avoids premature draws while restoring window state */
+    iBool         isMouseInside;
     SDL_Renderer *render;
     iWidget *     root;
     float         pixelRatio;