From 2d3a7b3032e284424462e4bdfe4aa06aa043af45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Sat, 7 Mar 2026 03:33:10 -0300 Subject: [PATCH] Add blockquote support. Fix a border rendering bug. Fix background-color in UIRichText. --- bin/assets/ui/breeze.css | 14 ++++++++++---- src/eepp/ui/uinode.cpp | 2 +- src/eepp/ui/uirichtext.cpp | 1 + src/eepp/ui/uiwidgetcreator.cpp | 1 + src/examples/ui_markdownview/ui_markdownview.cpp | 3 +-- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/bin/assets/ui/breeze.css b/bin/assets/ui/breeze.css index f5dcd04ff..180eeacf9 100644 --- a/bin/assets/ui/breeze.css +++ b/bin/assets/ui/breeze.css @@ -104,6 +104,7 @@ h6 { code { font-family: monospace; + background-color: var(--list-back); } p, ol, ul, pre { @@ -111,6 +112,7 @@ p, ol, ul, pre { } li { + margin: 0.67em 0; padding-left: 2em; background-image: url("data:image/svg+xml;utf8,"); background-tint: var(--font); @@ -133,12 +135,16 @@ a:hover { text-decoration: underline; } -img { +markdownview img { scale-type: fit-inside; - layout-width: match_parent; - layout-height: wrap_content; max-height: 100vh; - clip: true; +} + +blockquote { + padding-left: 8dp; + background-color: var(--list-back); + border-left: 2dp solid var(--tab-line); + margin: 0.67em 0; } pushbutton, diff --git a/src/eepp/ui/uinode.cpp b/src/eepp/ui/uinode.cpp index 9c9c9551e..907f8994f 100644 --- a/src/eepp/ui/uinode.cpp +++ b/src/eepp/ui/uinode.cpp @@ -1181,7 +1181,7 @@ UIBorderDrawable* UINode::getBorder() const { if ( NULL == mBorder ) { mBorder = UIBorderDrawable::New( this ); mBorder->setColor( Color::Transparent ); - mBorder->setLineWidth( PixelDensity::dpToPx( 1 ) ); + // mBorder->setLineWidth( PixelDensity::dpToPx( 1 ) ); } return mBorder; diff --git a/src/eepp/ui/uirichtext.cpp b/src/eepp/ui/uirichtext.cpp index 4f2318d21..0102e4a6c 100644 --- a/src/eepp/ui/uirichtext.cpp +++ b/src/eepp/ui/uirichtext.cpp @@ -99,6 +99,7 @@ bool UIRichText::applyProperty( const StyleSheetProperty& attribute ) { setFontColor( attribute.asColor() ); break; case PropertyId::BackgroundColor: + setBackgroundColor( attribute.asColor() ); setFontBackgroundColor( attribute.asColor() ); break; case PropertyId::TextShadowColor: diff --git a/src/eepp/ui/uiwidgetcreator.cpp b/src/eepp/ui/uiwidgetcreator.cpp index 86017fa67..dd8a52746 100644 --- a/src/eepp/ui/uiwidgetcreator.cpp +++ b/src/eepp/ui/uiwidgetcreator.cpp @@ -143,6 +143,7 @@ void UIWidgetCreator::createBaseWidgetList() { registeredWidget["mark"] = UITextSpan::NewMark; registeredWidget["div"] = UIRichText::New; registeredWidget["p"] = UIRichText::NewParagraph; + registeredWidget["blockquote"] = [] { return UIRichText::NewWithTag( "blockquote" ); }; registeredWidget["h1"] = UIRichText::NewH1; registeredWidget["h2"] = UIRichText::NewH2; registeredWidget["h3"] = UIRichText::NewH3; diff --git a/src/examples/ui_markdownview/ui_markdownview.cpp b/src/examples/ui_markdownview/ui_markdownview.cpp index 0ff6bb2f3..afbd932fd 100644 --- a/src/examples/ui_markdownview/ui_markdownview.cpp +++ b/src/examples/ui_markdownview/ui_markdownview.cpp @@ -25,7 +25,7 @@ This is a **bold** text and this is an *italic* text. 1. Ordered 1 2. Ordered 2 -> This is a blockquote. +> This is a blockquote. `inline code` @@ -36,7 +36,6 @@ void main() { printf("Hello World"); } ``` -