From 99b2f2b529287a647ba97f6684c8f22c85805a37 Mon Sep 17 00:00:00 2001 From: 76Octane <132669596+76Octane@users.noreply.github.com> Date: Sat, 10 Jun 2023 15:10:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20NotificationManager.cp?= =?UTF-8?q?p?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/slic3r/GUI/NotificationManager.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/NotificationManager.cpp b/src/slic3r/GUI/NotificationManager.cpp index 01144f0..eb9c906 100644 --- a/src/slic3r/GUI/NotificationManager.cpp +++ b/src/slic3r/GUI/NotificationManager.cpp @@ -238,15 +238,18 @@ bool NotificationManager::PopNotification::push_background_color() if (m_data.level == NotificationLevel::ErrorNotificationLevel) { // ImVec4 backcolor = ImGui::GetStyleColorVec4(ImGuiCol_WindowBg); ImVec4 backcolor(0.27f, 0.47f, 1.0f, 0.5f); - backcolor.x += 0.3f; + backcolor.x += 0.73f; + backcolor.y += 0.03f; + backcolor.z -= 1.0f; push_style_color(ImGuiCol_WindowBg, backcolor, m_state == EState::FadingOut, m_current_fade_opacity); return true; } if (m_data.level == NotificationLevel::WarningNotificationLevel) { // ImVec4 backcolor = ImGui::GetStyleColorVec4(ImGuiCol_WindowBg); ImVec4 backcolor(0.27f, 0.47f, 1.0f, 0.5f); - backcolor.x += 0.3f; - backcolor.y += 0.15f; + backcolor.x += 0.73f; + backcolor.y -= 0.47f; + backcolor.z -= 1.0f; push_style_color(ImGuiCol_WindowBg, backcolor, m_state == EState::FadingOut, m_current_fade_opacity); return true; } From 9e16e26de529c64f7cb2f00045baf0e48316104e Mon Sep 17 00:00:00 2001 From: sunsets <845944018@qq.com> Date: Sat, 10 Jun 2023 15:14:46 +0800 Subject: [PATCH 2/3] Update AABBMesh.cpp --- src/libslic3r/AABBMesh.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libslic3r/AABBMesh.cpp b/src/libslic3r/AABBMesh.cpp index 4741632..6b0c25e 100644 --- a/src/libslic3r/AABBMesh.cpp +++ b/src/libslic3r/AABBMesh.cpp @@ -11,7 +11,7 @@ #endif namespace Slic3r { -//YYY +//YYYBBBB class AABBMesh::AABBImpl { private: AABBTreeIndirect::Tree3f m_tree; From 6c7618a04057c78e18c916eca8210ca68fd449b7 Mon Sep 17 00:00:00 2001 From: 76Octane <132669596+76Octane@users.noreply.github.com> Date: Sat, 10 Jun 2023 15:27:07 +0800 Subject: [PATCH 3/3] Revert "Merge branch 'main' of https://github.com/QIDITECH/QIDISlicer" This reverts commit 98f378555439cb18c6f9ddb4663806faa59527d6, reversing changes made to 99b2f2b529287a647ba97f6684c8f22c85805a37. --- src/libslic3r/AABBMesh.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libslic3r/AABBMesh.cpp b/src/libslic3r/AABBMesh.cpp index 6b0c25e..ca7042c 100644 --- a/src/libslic3r/AABBMesh.cpp +++ b/src/libslic3r/AABBMesh.cpp @@ -11,7 +11,7 @@ #endif namespace Slic3r { -//YYYBBBB + class AABBMesh::AABBImpl { private: AABBTreeIndirect::Tree3f m_tree;