mirror of https://github.com/aseprite/aseprite.git
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
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:
commit
1b16cfbe71
2
laf
2
laf
|
@ -1 +1 @@
|
|||
Subproject commit 39706c11063fb53cf4c8e865102c6f71e2606906
|
||||
Subproject commit 29aa044517059df87158c9e5f26c92572effb103
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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,10 +50,8 @@ 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();
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue