From 466edb5fd657d34abcdf49a15bbbbd5051f6a872 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Wed, 7 Dec 2011 15:38:09 +0100 Subject: Colors. Patch for Bug #677081 (Default paste color opacity) by Romain. (bzr r10761) --- src/widgets/sp-color-notebook.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/widgets/sp-color-notebook.cpp') diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp index 1324e0b16..c9a09349b 100644 --- a/src/widgets/sp-color-notebook.cpp +++ b/src/widgets/sp-color-notebook.cpp @@ -486,9 +486,14 @@ void ColorNotebook::_rgbaEntryChanged(GtkEntry* entry) if (t) { Glib::ustring text = t; bool changed = false; - if (!text.empty() && text[0] == '#') { + + // 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()) { changed = true; - text.erase(0,1); + if (text[0] == '#') { + text.erase(0,1); + } if (text.size() == 6) { // it was a standard RGB hex unsigned int alph = SP_COLOR_F_TO_U(_alpha); -- cgit v1.2.3