From 3e6360d024e388e71e05507fad23a3cdcfadcb90 Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Tue, 2 Aug 2022 16:00:13 -0300
Subject: [PATCH 1/2] Fix crash using deleted os::Surface (fix #3451)

It looks like processing a specific kPaintMessage with
ui::Widget::sendMessage() might re-create the os::Surface and destroy
the previous one, so we need to keep a reference to the previous
surface just in case to keep it alive.

We aren't able to reproduce this crash, but we've received several
Sentry reports about it, only on Windows and since v1.2.34.1 (not sure
if it's related to that). We'll see if this does fix the crashes or we
have some kind of regression in the future.
---
 src/ui/manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui/manager.cpp b/src/ui/manager.cpp
index 32b05cd6d..6d28b71cf 100644
--- a/src/ui/manager.cpp
+++ b/src/ui/manager.cpp
@@ -1549,7 +1549,7 @@ bool Manager::sendMessageToWidget(Message* msg, Widget* widget)
     // Restore overlays in the region that we're going to paint.
     OverlayManager::instance()->restoreOverlappedAreas(paintMsg->rect());
 
-    os::Surface* surface = m_display->surface();
+    os::SurfaceRef surface(base::AddRef(m_display->surface()));
     surface->saveClip();
 
     if (surface->clipRect(paintMsg->rect())) {

From 55885ee266fbb7d01894cf0a456aaceb8cc807c7 Mon Sep 17 00:00:00 2001
From: Gaspar Capello <gaspar@igarastudio.com>
Date: Fri, 29 Jul 2022 18:42:20 -0300
Subject: [PATCH 2/2] Fix regression: TextBox isn't rendering text (doesn't
 update the bounds area of the text box)

Regression in dd0c29620974e56d9e62653804b996740a89e88a (Use
tooltip_text style & color to paint tooltip windows #2554).

Prior this fix, text box does not update its bounds area because it
has not a style assigned.

Fix #3442, fix #3443
---
 data/extensions/aseprite-theme/theme.xml | 4 ++++
 src/app/ui/skin/skin_theme.cpp           | 3 +--
 src/ui/theme.cpp                         | 9 +++------
 src/ui/theme.h                           | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index 558031496..52586b1b4 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -503,6 +503,10 @@
             <background color="tooltip_face" />
             <text color="tooltip_text" align="left" />
         </style>
+        <style id="textbox_text" align="left top wordwrap" border="4">
+            <background color="textbox_face" />
+            <text color="textbox_text" align="left" />
+        </style>
         <style id="label" padding="1">
             <text color="text" align="left" />
             <text color="disabled" align="left" state="disabled" />
diff --git a/src/app/ui/skin/skin_theme.cpp b/src/app/ui/skin/skin_theme.cpp
index 45768fb1a..d0e1f9c9f 100644
--- a/src/app/ui/skin/skin_theme.cpp
+++ b/src/app/ui/skin/skin_theme.cpp
@@ -913,9 +913,8 @@ void SkinTheme::initWidget(Widget* widget)
       break;
 
     case kTextBoxWidget:
-      BORDER(4*guiscale());
       widget->setChildSpacing(0);
-      widget->setBgColor(colors.textboxFace());
+      widget->setStyle(styles.textboxText());
       break;
 
     case kViewWidget:
diff --git a/src/ui/theme.cpp b/src/ui/theme.cpp
index e15de8777..2dd3d597a 100644
--- a/src/ui/theme.cpp
+++ b/src/ui/theme.cpp
@@ -294,10 +294,9 @@ void Theme::paintTooltip(Graphics* g,
   }
 }
 
-gfx::Size Theme::paintTextBoxWithStyle(Graphics* g,
-                                       const Widget* widget)
+void Theme::paintTextBoxWithStyle(Graphics* g,
+                                  const Widget* widget)
 {
-  gfx::Size size;
   gfx::Color bg = gfx::ColorNone, fg = gfx::ColorNone;
 
   for_each_layer(
@@ -311,9 +310,7 @@ gfx::Size Theme::paintTextBoxWithStyle(Graphics* g,
     });
 
   if (fg != gfx::ColorNone)
-    Theme::drawTextBox(g, widget, &size.w, &size.h, bg, fg);
-
-  return size;
+    Theme::drawTextBox(g, widget, nullptr, nullptr, bg, fg);
 }
 
 void Theme::paintLayer(Graphics* g,
diff --git a/src/ui/theme.h b/src/ui/theme.h
index e04750d6d..fe5349af2 100644
--- a/src/ui/theme.h
+++ b/src/ui/theme.h
@@ -101,8 +101,8 @@ namespace ui {
                               const int arrowAlign,
                               const gfx::Rect& target);
 
-    gfx::Size paintTextBoxWithStyle(Graphics* g,
-                                    const Widget* widget);
+    void paintTextBoxWithStyle(Graphics* g,
+                               const Widget* widget);
 
     virtual gfx::Size calcSizeHint(const Widget* widget,
                                    const Style* style);