Merge cc15775e14 into 1b16cfbe71

laf

@@ -1 +1 @@
-Subproject commit 39706c11063fb53cf4c8e865102c6f71e2606906
+Subproject commit 29aa044517059df87158c9e5f26c92572effb103

src/app/script/values.cpp

@@ -34,7 +34,6 @@ namespace app { namespace script {
 template<>
 void push_value_to_lua(lua_State* L, const std::nullptr_t&)
 {
-  TRACEARGS("push_value_to_lua nullptr_t");
   lua_pushnil(L);
 }
 

src/app/ui/task_widget.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2023  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -50,11 +50,9 @@ TaskWidget::TaskWidget(const Type type, base::task::func_t&& func)
     }
     else if (m_progressBar.parent()) {
       float v = m_task.progress();
-      if (v > 0.0f) {
-        TRACEARGS("progressBar setValue", int(std::clamp(v * 100.0f, 0.0f, 100.0f)));
+      if (v > 0.0f)
         m_progressBar.setValue(int(std::clamp(v * 100.0f, 0.0f, 100.0f)));
     }
-    }
   });
   m_monitorTimer.start();
 

src/app/ui/timeline/timeline.cpp

@@ -4631,13 +4631,13 @@ void Timeline::onDrop(ui::DragEvent& e)
       std::string txmsg;
       std::unique_ptr<docapi::DocProvider> docProvider = nullptr;
       if (droppedImage) {
-        txmsg = "Dropped image on timeline";
+        txmsg = "Drop Image";
         doc::ImageRef image = nullptr;
         convert_surface_to_image(surface.get(), 0, 0, surface->width(), surface->height(), image);
         docProvider = std::make_unique<DocProviderFromImage>(image);
       }
       else {
-        txmsg = "Dropped paths on timeline";
+        txmsg = "Drop File";
         docProvider = std::make_unique<DocProviderFromPaths>(m_document->context(), paths);
       }
 

src/app/util/conversion_to_image.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (c) 2024  Igara Studio S.A.
+// Copyright (c) 2024-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -26,7 +26,7 @@ uint32_t convert_color_to_image(gfx::Color c, const os::SurfaceFormatData* fd)
   uint8_t b = ((c & fd->blueMask) >> fd->blueShift);
   uint8_t a = ((c & fd->alphaMask) >> fd->alphaShift);
 
-  if (fd->pixelAlpha == os::PixelAlpha::kPremultiplied) {
+  if (a > 0 && fd->pixelAlpha == os::PixelAlpha::kPremultiplied) {
     r = r * 255 / a;
     g = g * 255 / a;
     b = b * 255 / a;

src/steam/steam.cpp

@@ -1,5 +1,5 @@
 // Aseprite Steam Wrapper
-// Copyright (c) 2020-2024 Igara Studio S.A.
+// Copyright (c) 2020-2025 Igara Studio S.A.
 // Copyright (c) 2016 David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -153,8 +153,6 @@ public:
 
     CallbackMsg_t msg;
     if (SteamAPI_ManualDispatch_GetNextCallback(m_pipe, &msg)) {
-      // TRACEARGS("SteamAPI_ManualDispatch_GetNextCallback", msg.callback);
-
       bool disconnected = false;
       switch (msg.callback) {
         case kSteamServersDisconnected: