root
/
aseprite
mirror of https://github.com/aseprite/aseprite.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch 'main' into beta
build-auto / build-auto (Debug, macos-latest) (push) Waiting to run Details
build-auto / build-auto (Debug, ubuntu-latest) (push) Waiting to run Details
build-auto / build-auto (Debug, windows-latest) (push) Waiting to run Details
build-auto / build-auto (RelWithDebInfo, macos-latest) (push) Waiting to run Details
build-auto / build-auto (RelWithDebInfo, ubuntu-latest) (push) Waiting to run Details
build-auto / build-auto (RelWithDebInfo, windows-latest) (push) Waiting to run Details
build / build (Debug, macos-latest, lua, cli) (push) Waiting to run Details
build / build (Debug, macos-latest, noscripts, cli) (push) Waiting to run Details
build / build (Debug, ubuntu-latest, lua, cli) (push) Waiting to run Details
build / build (Debug, ubuntu-latest, noscripts, cli) (push) Waiting to run Details
build / build (Debug, windows-latest, lua, cli) (push) Waiting to run Details
build / build (Debug, windows-latest, noscripts, cli) (push) Waiting to run Details
build / build (RelWithDebInfo, macos-latest, lua, gui) (push) Waiting to run Details
build / build (RelWithDebInfo, ubuntu-latest, lua, gui) (push) Waiting to run Details
build / build (RelWithDebInfo, windows-latest, lua, gui) (push) Waiting to run Details

This commit is contained in:
David Capello 2025-10-07 08:06:10 -03:00
parent 6c7544a132 d3ef5c61da
commit 1b16cfbe71
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laf

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

1
src/app/script/values.cpp
View File

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

6
src/app/ui/task_widget.cpp
View File

@ -1,5 +1,5 @@
// Aseprite // 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 // This program is distributed under the terms of
// the End-User License Agreement for Aseprite. // 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()) { else if (m_progressBar.parent()) {
float v = m_task.progress(); float v = m_task.progress();
if (v > 0.0f) { if (v > 0.0f)
TRACEARGS("progressBar setValue", int(std::clamp(v * 100.0f, 0.0f, 100.0f)));
m_progressBar.setValue(int(std::clamp(v * 100.0f, 0.0f, 100.0f))); m_progressBar.setValue(int(std::clamp(v * 100.0f, 0.0f, 100.0f)));
} }
}
}); });
m_monitorTimer.start(); m_monitorTimer.start();

4
src/steam/steam.cpp
View File

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