Skip to content

Fixing #5616 - NEEDS LOCAL TESTING - (Read description) - ColorPicker Select Screen Color #5619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fixing #5616 - NEEDS LOCAL TESTING - (Read description) - ColorPicker Select Screen Color #5619

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f03abb5
Removed DontUseNativeDialog to fix ColorPicker bug
Sep 15, 2024
6bc490c
Adding requested fix
kaihilbourne Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/windows/color_picker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ def __init__(self, initial_color: QColor, callback, extra_options=0,
super().__init__(parent=parent, *args, **kwargs)
self.setObjectName("ColorPicker")
# Merge any additional user-supplied options with our own
options = QColorDialog.DontUseNativeDialog

This comment was marked as resolved.

Sign in to view

if extra_options > 0:
options = options | extra_options
# Set up non-modal color dialog (to avoid blocking the eyedropper)
Expand All @@ -53,7 +52,6 @@ def __init__(self, initial_color: QColor, callback, extra_options=0,
if title:
self.dialog.setWindowTitle(title)
self.dialog.setWindowFlags(Qt.Tool)
self.dialog.setOptions(options)

This comment was marked as resolved.

Sign in to view

# Avoid signal loops
self.dialog.blockSignals(True)
self.dialog.colorSelected.connect(callback)
Expand Down