comparison: src/colorSelectDialog.cpp
src/colorSelectDialog.cpp
- changeset 189
- ac2d3e8dd110
- parent 183
- f1b8cb53d2a2
- child 199
- 10dd5909a50e
equal
deleted
inserted
replaced
| 188:4e686b771996 | 189:ac2d3e8dd110 |
|---|---|
| 106 | 106 |
| 107 const double x = (i % g_dNumColumns) * g_dSquareSize; | 107 const double x = (i % g_dNumColumns) * g_dSquareSize; |
| 108 const double y = (i / g_dNumColumns) * g_dSquareSize; | 108 const double y = (i / g_dNumColumns) * g_dSquareSize; |
| 109 const double w = (g_dSquareSize) - (fPenWidth / 2); | 109 const double w = (g_dSquareSize) - (fPenWidth / 2); |
| 110 | 110 |
| 111 QColor col = meta->qColor; | 111 QColor col = meta->faceColor; |
| 112 | 112 |
| 113 if (i == maincolor) { | 113 if (i == maincolor) { |
| 114 // Use the user preferences for main color here | 114 // Use the user preferences for main color here |
| 115 col = gl_maincolor.value.chars (); | 115 col = gl_maincolor.value.chars (); |
| 116 col.setAlpha (gl_maincolor_alpha * 255.0f); | 116 col.setAlpha (gl_maincolor_alpha * 255.0f); |
| 140 lb_colorInfo->setText ("---"); | 140 lb_colorInfo->setText ("---"); |
| 141 return; | 141 return; |
| 142 } | 142 } |
| 143 | 143 |
| 144 lb_colorInfo->setText (fmt ("%d - %s", | 144 lb_colorInfo->setText (fmt ("%d - %s", |
| 145 selColor, col->zName.chars())); | 145 selColor, col->name.chars())); |
| 146 } | 146 } |
| 147 | 147 |
| 148 // ============================================================================= | 148 // ============================================================================= |
| 149 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * | 149 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * |
| 150 // ============================================================================= | 150 // ============================================================================= |
