Skip to content

Commit

Permalink
use QColorDialog in zenoplayer
Browse files Browse the repository at this point in the history
  • Loading branch information
miyanyan authored Oct 11, 2023
1 parent ae67e1e commit 982fab7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
3 changes: 1 addition & 2 deletions ui/zenoplayer/zenoplayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <zeno/extra/GlobalComm.h>
#include <zeno/extra/GlobalStatus.h>
#include <zeno/utils/logger.h>
#include <zenoui/ColorEditor/ColorEditor.h>


ZenoPlayer::ZenoPlayer(ZENO_PLAYER_INIT_PARAM param, QWidget *parent)
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 0 additions & 2 deletions zeno/src/nodes/color/MakeColor.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#include <sstream>

#include <zeno/zeno.h>
#include <zeno/utils/log.h>

Expand Down

0 comments on commit 982fab7

Please sign in to comment.