diff options
| author | Nicolas Dufour <nicoduf@yahoo.fr> | 2012-01-16 19:46:34 +0000 |
|---|---|---|
| committer | JazzyNico <nicoduf@yahoo.fr> | 2012-01-16 19:46:34 +0000 |
| commit | 31331dcbfe156f7e66174ec4f5576d0ebbf96ff5 (patch) | |
| tree | 352f354c4f8feb1433ab96f754d6c9615f9f5632 /src | |
| parent | fix compilation error (diff) | |
| download | inkscape-31331dcbfe156f7e66174ec4f5576d0ebbf96ff5.tar.gz inkscape-31331dcbfe156f7e66174ec4f5576d0ebbf96ff5.zip | |
Reverting revision 10761 (regression found in the color notebook, see Bug #Bug #677081).
(bzr r10893)
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/sp-color-notebook.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp index c9a09349b..1324e0b16 100644 --- a/src/widgets/sp-color-notebook.cpp +++ b/src/widgets/sp-color-notebook.cpp @@ -486,14 +486,9 @@ void ColorNotebook::_rgbaEntryChanged(GtkEntry* entry) if (t) { Glib::ustring text = t; bool changed = false; - - // Here we deal with pasted colors with theformat '#RRGGBB' or 'RRGGBB' - // In those cases we keep (and so add) the current alpha value. - if (!text.empty()) { + if (!text.empty() && text[0] == '#') { changed = true; - if (text[0] == '#') { - text.erase(0,1); - } + text.erase(0,1); if (text.size() == 6) { // it was a standard RGB hex unsigned int alph = SP_COLOR_F_TO_U(_alpha); |