AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cocoa: fix shared color panel usage

Browse Source 
Task-number: QTBUG-31819
Change-Id: I60162f4c4af8aaae02ba7be11b2793ad29c5e2b5
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
This commit is contained in:
J-P Nurmi 2013-06-28 17:26:27 +02:00 committed by The Qt Project
parent 17fe17d525
commit eeffcfbd89
2 changed files with 144 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/platforms/cocoa/qcocoacolordialoghelper.h
View File

@ -59,15 +59,6 @@ public:
void setCurrentColor(const QColor&);
QColor currentColor() const;
public:
bool showCocoaColorPanel(Qt::WindowModality windowModality, QWindow *parent);
bool hideCocoaColorPanel();
void createNSColorPanelDelegate();
private:
void *mDelegate;
};
QT_END_NAMESPACE

227
src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
View File

@ -89,11 +89,14 @@ static NSButton *macCreateButton(const char *text, NSView *superview)
@implementation QT_MANGLE_NAMESPACE(QNSColorPanelDelegate)
- (id)initWithDialogHelper:(QCocoaColorDialogHelper *)helper
- (id)init
{
self = [super init];
mColorPanel = [NSColorPanel sharedColorPanel];
mHelper = helper;
mHelper = 0;
mStolenContentView = 0;
mOkButton = 0;
mCancelButton = 0;
mResultCode = NSCancelButton;
mDialogIsExecuting = false;
mResultSet = false;
@ -103,11 +106,31 @@ static NSButton *macCreateButton(const char *text, NSView *superview)
[mColorPanel setRestorable:NO];
#endif
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(colorChanged:)
name:NSColorPanelColorDidChangeNotification
object:mColorPanel];
[mColorPanel retain];
return self;
}
- (void)dealloc
{
[self restoreOriginalContentView];
[mColorPanel setDelegate:nil];
[[NSNotificationCenter defaultCenter] removeObserver:self];
[super dealloc];
}
- (void)setDialogHelper:(QCocoaColorDialogHelper *)helper
{
mHelper = helper;
[mColorPanel setShowsAlpha:mHelper->options()->testOption(QColorDialogOptions::ShowAlphaChannel)];
if (mHelper->options()->testOption(QColorDialogOptions::NoButtons)) {
mStolenContentView = 0;
mOkButton = 0;
mCancelButton = 0;
} else {
[self restoreOriginalContentView];
} else if (!mStolenContentView) {
// steal the color panel's contents view
mStolenContentView = [mColorPanel contentView];
[mStolenContentView retain];
@ -132,33 +155,6 @@ static NSButton *macCreateButton(const char *text, NSView *superview)
[mCancelButton setAction:@selector(onCancelClicked)];
[mCancelButton setTarget:self];
}
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(colorChanged:)
name:NSColorPanelColorDidChangeNotification
object:mColorPanel];
[mColorPanel retain];
return self;
}
- (void)dealloc
{
if (mOkButton) {
NSView *ourContentView = [mColorPanel contentView];
// return stolen stuff to its rightful owner
[mStolenContentView removeFromSuperview];
[mColorPanel setContentView:mStolenContentView];
[mOkButton release];
[mCancelButton release];
[ourContentView release];
}
[mColorPanel setDelegate:nil];
[[NSNotificationCenter defaultCenter] removeObserver:self];
[super dealloc];
}
- (void)closePanel
@ -176,9 +172,27 @@ static NSButton *macCreateButton(const char *text, NSView *superview)
{
Q_UNUSED(notification);
[self updateQtColor];
if (mHelper)
emit mHelper->colorSelected(mQtColor);
}
- (void)restoreOriginalContentView
{
if (mStolenContentView) {
NSView *ourContentView = [mColorPanel contentView];
// return stolen stuff to its rightful owner
[mStolenContentView removeFromSuperview];
[mColorPanel setContentView:mStolenContentView];
[mOkButton release];
[mCancelButton release];
[ourContentView release];
mOkButton = 0;
mCancelButton = 0;
mStolenContentView = 0;
}
}
- (void)relayout
{
if (!mOkButton)
@ -273,6 +287,7 @@ static NSButton *macCreateButton(const char *text, NSView *superview)
mQtColor.setRgbF(red, green, blue, alpha);
}
}
if (mHelper)
emit mHelper->currentColorChanged(mQtColor);
}
@ -310,6 +325,7 @@ static NSButton *macCreateButton(const char *text, NSView *superview)
[self finishOffWithCode:NSCancelButton];
} else {
mResultSet = true;
if (mHelper)
emit mHelper->reject();
}
return true;
@ -345,55 +361,64 @@ static NSButton *macCreateButton(const char *text, NSView *superview)
QT_BEGIN_NAMESPACE
QCocoaColorDialogHelper::QCocoaColorDialogHelper() :
mDelegate(0)
class QCocoaColorPanel
{
public:
QCocoaColorPanel()
{
mDelegate = [[QT_MANGLE_NAMESPACE(QNSColorPanelDelegate) alloc] init];
}
QCocoaColorDialogHelper::~QCocoaColorDialogHelper()
~QCocoaColorPanel()
{
if (!mDelegate)
return;
[reinterpret_cast<QT_MANGLE_NAMESPACE(QNSColorPanelDelegate) *>(mDelegate) release];
mDelegate = 0;
[mDelegate release];
}
void QCocoaColorDialogHelper::exec()
void init(QCocoaColorDialogHelper *helper)
{
[mDelegate setDialogHelper:helper];
}
void cleanup(QCocoaColorDialogHelper *helper)
{
if (mDelegate->mHelper == helper)
mDelegate->mHelper = 0;
}
bool exec()
{
// Note: If NSApp is not running (which is the case if e.g a top-most
// QEventLoop has been interrupted, and the second-most event loop has not
// yet been reactivated (regardless if [NSApp run] is still on the stack)),
// showing a native modal dialog will fail.
QT_MANGLE_NAMESPACE(QNSColorPanelDelegate) *delegate = static_cast<QT_MANGLE_NAMESPACE(QNSColorPanelDelegate) *>(mDelegate);
if ([delegate runApplicationModalPanel])
emit accept();
else
emit reject();
return [mDelegate runApplicationModalPanel];
}
bool QCocoaColorDialogHelper::show(Qt::WindowFlags, Qt::WindowModality windowModality, QWindow *parent)
bool show(Qt::WindowModality windowModality, QWindow *parent)
{
if (windowModality == Qt::WindowModal)
windowModality = Qt::ApplicationModal;
return showCocoaColorPanel(windowModality, parent);
Q_UNUSED(parent);
if (windowModality != Qt::WindowModal)
[mDelegate showModelessPanel];
// no need to show a Qt::WindowModal dialog here, because it's necessary to call exec() in that case
return true;
}
void QCocoaColorDialogHelper::hide()
void hide()
{
if (!mDelegate)
return;
[reinterpret_cast<QT_MANGLE_NAMESPACE(QNSColorPanelDelegate) *>(mDelegate)->mColorPanel close];
[mDelegate closePanel];
}
void QCocoaColorDialogHelper::setCurrentColor(const QColor &color)
QColor currentColor() const
{
if (!mDelegate)
createNSColorPanelDelegate();
QT_MANGLE_NAMESPACE(QNSColorPanelDelegate) *delegate = static_cast<QT_MANGLE_NAMESPACE(QNSColorPanelDelegate) *>(mDelegate);
return mDelegate->mQtColor;
}
void setCurrentColor(const QColor &color)
{
// make sure that if ShowAlphaChannel option is set then also setShowsAlpha
// needs to be set, otherwise alpha value is omitted
[delegate->mColorPanel setShowsAlpha:options()->testOption(QColorDialogOptions::ShowAlphaChannel)];
if (color.alpha() < 255)
[mDelegate->mColorPanel setShowsAlpha:YES];
NSColor *nsColor;
const QColor::Spec spec = color.spec();
@ -409,49 +434,55 @@ void QCocoaColorDialogHelper::setCurrentColor(const QColor &color)
blue:color.blueF()
alpha:color.alphaF()];
}
delegate->mQtColor = color;
[delegate->mColorPanel setColor:nsColor];
mDelegate->mQtColor = color;
[mDelegate->mColorPanel setColor:nsColor];
}
private:
QT_MANGLE_NAMESPACE(QNSColorPanelDelegate) *mDelegate;
};
Q_GLOBAL_STATIC(QCocoaColorPanel, sharedColorPanel)
QCocoaColorDialogHelper::QCocoaColorDialogHelper()
{
}
QCocoaColorDialogHelper::~QCocoaColorDialogHelper()
{
sharedColorPanel()->cleanup(this);
}
void QCocoaColorDialogHelper::exec()
{
if (sharedColorPanel()->exec())
emit accept();
else
emit reject();
}
bool QCocoaColorDialogHelper::show(Qt::WindowFlags, Qt::WindowModality windowModality, QWindow *parent)
{
if (windowModality == Qt::WindowModal)
windowModality = Qt::ApplicationModal;
sharedColorPanel()->init(this);
return sharedColorPanel()->show(windowModality, parent);
}
void QCocoaColorDialogHelper::hide()
{
sharedColorPanel()->hide();
}
void QCocoaColorDialogHelper::setCurrentColor(const QColor &color)
{
sharedColorPanel()->init(this);
sharedColorPanel()->setCurrentColor(color);
}
QColor QCocoaColorDialogHelper::currentColor() const
{
if (!mDelegate)
return QColor();
return reinterpret_cast<QT_MANGLE_NAMESPACE(QNSColorPanelDelegate) *>(mDelegate)->mQtColor;
}
void QCocoaColorDialogHelper::createNSColorPanelDelegate()
{
if (mDelegate)
return;
QT_MANGLE_NAMESPACE(QNSColorPanelDelegate) *delegate = [[QT_MANGLE_NAMESPACE(QNSColorPanelDelegate) alloc]
initWithDialogHelper:this];
mDelegate = delegate;
}
bool QCocoaColorDialogHelper::showCocoaColorPanel(Qt::WindowModality windowModality, QWindow *parent)
{
Q_UNUSED(parent);
createNSColorPanelDelegate();
QT_MANGLE_NAMESPACE(QNSColorPanelDelegate) *delegate = static_cast<QT_MANGLE_NAMESPACE(QNSColorPanelDelegate) *>(mDelegate);
[delegate->mColorPanel setShowsAlpha:options()->testOption(QColorDialogOptions::ShowAlphaChannel)];
if (windowModality != Qt::WindowModal)
[delegate showModelessPanel];
// no need to show a Qt::WindowModal dialog here, because it's necessary to call exec() in that case
return true;
}
bool QCocoaColorDialogHelper::hideCocoaColorPanel()
{
if (!mDelegate){
return false;
} else {
QT_MANGLE_NAMESPACE(QNSColorPanelDelegate) *delegate = static_cast<QT_MANGLE_NAMESPACE(QNSColorPanelDelegate) *>(mDelegate);
[delegate closePanel];
return true;
}
return sharedColorPanel()->currentColor();
}
QT_END_NAMESPACE