implemented color picker in dialog

Fixes #1757
This commit is contained in:
itsmattkc
2021-10-01 15:41:24 -07:00
parent ee81a47f2e
commit 7b65ecace5
13 changed files with 328 additions and 28 deletions
@@ -20,6 +20,8 @@
#include "pixelsamplerpanel.h"
#include "core.h"
namespace olive {
PixelSamplerPanel::PixelSamplerPanel(QWidget *parent) :
@@ -28,6 +30,9 @@ PixelSamplerPanel::PixelSamplerPanel(QWidget *parent) :
sampler_widget_ = new ManagedPixelSamplerWidget();
SetWidgetWithPadding(sampler_widget_);
connect(this, &PixelSamplerPanel::visibilityChanged, Core::instance(), &Core::RequestPixelSamplingInViewers);
connect(Core::instance(), &Core::ColorPickerColorEmitted, this, &PixelSamplerPanel::SetValues);
Retranslate();
}
-8
View File
@@ -72,14 +72,6 @@ void ViewerPanelBase::DisconnectTimeBasedPanel(TimeBasedPanel *panel)
disconnect(panel, &TimeBasedPanel::ShuttleRightRequested, this, &ViewerPanelBase::ShuttleRight);
}
void ViewerPanelBase::ConnectPixelSamplerPanel(PixelSamplerPanel *psp)
{
ViewerWidget* vw = static_cast<ViewerWidget*>(GetTimeBasedWidget());
connect(psp, &PixelSamplerPanel::visibilityChanged, vw, &ViewerWidget::SetSignalCursorColorEnabled);
connect(vw, &ViewerWidget::CursorColor, psp, &PixelSamplerPanel::SetValues);
}
void ViewerPanelBase::SetFullScreen(QScreen *screen)
{
static_cast<ViewerWidget*>(GetTimeBasedWidget())->SetFullScreen(screen);
-2
View File
@@ -47,8 +47,6 @@ public:
void DisconnectTimeBasedPanel(TimeBasedPanel* panel);
void ConnectPixelSamplerPanel(PixelSamplerPanel *psp);
/**
* @brief Wrapper for ViewerWidget::SetFullScreen()
*/