From 982fab79fb119f593723bcd8ee9c1c76f8e5881b Mon Sep 17 00:00:00 2001 From: miyanyan <40262194+miyanyan@users.noreply.github.com> Date: Wed, 11 Oct 2023 17:57:54 +0800 Subject: [PATCH] use QColorDialog in zenoplayer --- ui/zenoplayer/zenoplayer.cpp | 3 +-- zeno/src/nodes/color/MakeColor.cpp | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ui/zenoplayer/zenoplayer.cpp b/ui/zenoplayer/zenoplayer.cpp index 6c644c82f6..6e30db369a 100644 --- a/ui/zenoplayer/zenoplayer.cpp +++ b/ui/zenoplayer/zenoplayer.cpp @@ -18,7 +18,6 @@ #include #include #include -#include ZenoPlayer::ZenoPlayer(ZENO_PLAYER_INIT_PARAM param, QWidget *parent) @@ -110,7 +109,7 @@ QMenuBar *ZenoPlayer::initMenu() connect(pAction, &QAction::triggered, this, [=]() { auto [r, g, b] = Zenovis::GetInstance().getSession()->get_background_color(); auto c = QColor::fromRgbF(r, g, b); - c = ColorEditor::getColor(c); + c = QColorDialog::getColor(c); if (c.isValid()) { Zenovis::GetInstance().getSession()->set_background_color(c.redF(), c.greenF(), c.blueF()); ((ZenoPlayer *)zenoApp->getWindow("ZenoPlayer"))->updateFrame(); diff --git a/zeno/src/nodes/color/MakeColor.cpp b/zeno/src/nodes/color/MakeColor.cpp index 9871d79139..63c03a3399 100644 --- a/zeno/src/nodes/color/MakeColor.cpp +++ b/zeno/src/nodes/color/MakeColor.cpp @@ -1,5 +1,3 @@ -#include - #include #include