Mercurial > octave

comparison libgui/src/color-picker.cc @ 31648:29d734430e5f stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Re-indent code after switch to using namespace macros. * BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h, ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h, CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h, ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h, Figure.cc, Figure.h, FigureWindow.cc, FigureWindow.h, GLCanvas.cc, GLCanvas.h, GenericEventNotify.h, KeyMap.cc, KeyMap.h, ListBoxControl.cc, ListBoxControl.h, Logger.cc, Logger.h, Menu.cc, Menu.h, MenuContainer.h, Object.cc, Object.h, ObjectProxy.cc, ObjectProxy.h, Panel.cc, Panel.h, PopupMenuControl.cc, PopupMenuControl.h, PushButtonControl.cc, PushButtonControl.h, PushTool.cc, PushTool.h, QtHandlesUtils.cc, QtHandlesUtils.h, RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc, SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h, TextEdit.cc, TextEdit.h, ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc, ToolBar.h, ToolBarButton.cc, ToolBarButton.h, annotation-dialog.cc, annotation-dialog.h, gl-select.cc, gl-select.h, qopengl-functions.h, qt-graphics-toolkit.cc, qt-graphics-toolkit.h, module.mk, QTerminal.h, color-picker.cc, color-picker.h, command-widget.cc, command-widget.h, community-news.cc, community-news.h, dialog.cc, dialog.h, documentation-bookmarks.cc, documentation-bookmarks.h, documentation-dock-widget.cc, documentation-dock-widget.h, documentation.cc, documentation.h, dw-main-window.cc, dw-main-window.h, external-editor-interface.cc, external-editor-interface.h, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, find-files-dialog.h, find-files-model.cc, find-files-model.h, graphics-init.cc, graphics-init.h, gui-settings.cc, gui-settings.h, gui-utils.cc, gui-utils.h, history-dock-widget.cc, history-dock-widget.h, interpreter-qobject.cc, interpreter-qobject.h, led-indicator.cc, led-indicator.h, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, find-dialog.h, marker.cc, marker.h, octave-qscintilla.cc, octave-qscintilla.h, octave-txt-lexer.cc, octave-txt-lexer.h, main-window.cc, main-window.h, news-reader.cc, news-reader.h, octave-dock-widget.cc, octave-dock-widget.h, octave-qobject.cc, octave-qobject.h, qt-application.cc, qt-application.h, qt-interpreter-events.cc, qt-interpreter-events.h, qt-utils.h, release-notes.cc, release-notes.h, resource-manager.cc, resource-manager.h, set-path-dialog.cc, set-path-dialog.h, set-path-model.cc, set-path-model.h, settings-dialog.cc, settings-dialog.h, shortcut-manager.cc, shortcut-manager.h, tab-bar.cc, tab-bar.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor-model.cc, variable-editor-model.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, welcome-wizard.h, workspace-model.cc, workspace-model.h, workspace-view.cc, workspace-view.h: Re-indent code after switch to using namespace macros.
author John W. Eaton <jwe@octave.org>
date Tue, 06 Dec 2022 14:53:00 -0500
parents c6d54dd31a7e
children 597f3ee61a48
comparison
equal deleted inserted replaced
31646:c6d54dd31a7e 31648:29d734430e5f
32 32
33 #include "color-picker.h" 33 #include "color-picker.h"
34 34
35 OCTAVE_BEGIN_NAMESPACE(octave) 35 OCTAVE_BEGIN_NAMESPACE(octave)
36 36
37 // Constructor with initial color as parameter 37 // Constructor with initial color as parameter
38 color_picker::color_picker (QColor old_color, QWidget *p) 38 color_picker::color_picker (QColor old_color, QWidget *p)
39 : QPushButton (p) 39 : QPushButton (p)
40 { 40 {
41 m_color = old_color; 41 m_color = old_color;
42 setFlat (true); 42 setFlat (true);
43 setFocusPolicy (Qt::NoFocus); // no focus, would change the color 43 setFocusPolicy (Qt::NoFocus); // no focus, would change the color
44 update_button (); 44 update_button ();
45 connect (this, &color_picker::clicked, this, &color_picker::select_color); 45 connect (this, &color_picker::clicked, this, &color_picker::select_color);
46 } 46 }
47 47
48 // Slot for button clicked: select a new color using QColorDialog 48 // Slot for button clicked: select a new color using QColorDialog
49 void color_picker::select_color (void) 49 void color_picker::select_color (void)
50 { 50 {
51 QColor new_color = QColorDialog::getColor (m_color); 51 QColor new_color = QColorDialog::getColor (m_color);
52 52
53 if (new_color.isValid () && new_color != m_color) 53 if (new_color.isValid () && new_color != m_color)
54 { 54 {
55 m_color = new_color; 55 m_color = new_color;
56 update_button (); 56 update_button ();
57 } 57 }
58 } 58 }
59 59
60 // Set the color of the button 60 // Set the color of the button
61 void color_picker::set_color (QColor new_color) 61 void color_picker::set_color (QColor new_color)
62 { 62 {
63 m_color = new_color; 63 m_color = new_color;
64 update_button (); 64 update_button ();
65 } 65 }
66 66
67 // Draw the button with the actual color (using a stylesheet) 67 // Draw the button with the actual color (using a stylesheet)
68 void color_picker::update_button (void) 68 void color_picker::update_button (void)
69 { 69 {
70 // Is this the right place to look for a "foreground" color that would 70 // Is this the right place to look for a "foreground" color that would
71 // provide a reasonable border for the color swatches? 71 // provide a reasonable border for the color swatches?
72 QWidget *p = parentWidget (); 72 QWidget *p = parentWidget ();
73 73
74 QString bordercolor 74 QString bordercolor
75 = (p ? p->palette ().text ().color ().name () : QString ("#000000")); 75 = (p ? p->palette ().text ().color ().name () : QString ("#000000"));
76 76
77 setStyleSheet (QString ("background-color: %1; border: 1px solid %2;") 77 setStyleSheet (QString ("background-color: %1; border: 1px solid %2;")
78 .arg (m_color.name ()) 78 .arg (m_color.name ())
79 .arg (bordercolor)); 79 .arg (bordercolor));
80 80
81 repaint (); 81 repaint ();
82 } 82 }
83 83
84 OCTAVE_END_NAMESPACE(octave) 84 OCTAVE_END_NAMESPACE(octave)