[umbrello] [Bug 443679] Exiting color change popup via "Cancel" modifies the selected diagram object

[Oliver Kellogg]

https://bugs.kde.org/show_bug.cgi?id=443679

Oliver Kellogg <okellogg at users.sourceforge.net> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Resolution|---                         |FIXED
             Status|REPORTED                    |RESOLVED
      Latest Commit|                            |https://invent.kde.org/sdk/
                   |                            |umbrello/commit/eac23da83da
                   |                            |18c4f966e4a01b948be74041561
                   |                            |23

--- Comment #1 from Oliver Kellogg <okellogg at users.sourceforge.net> ---
Git commit eac23da83da18c4f966e4a01b948be7404156123 by Oliver Kellogg.
Committed on 13/10/2021 at 20:52.
Pushed by okellogg into branch 'master'.

Fix "Exiting color change popup via Cancel modifies the selected diagram
object"

umbrello/umlwidgets/associationwidget.cpp
- In function slotMenuSelection case ListPopupMenu::mt_Line_Color, after
  returning from QColorDialog::getColor() require newColor.isValid() to
  return true as precondition for modifying the line color.

umbrello/umlwidgets/widgetbase.cpp
- In function slotMenuSelection cases mt_Line_Color_Selection and
  mt_Fill_Color_Selection, after returning from QColorDialog::getColor()
  require newColor.isValid() to return true as precondition for
  modifying the color.
- Move opening brace outside #if / #else / #endif to avoid imbalance
  with closing brace.

M  +3    -2    umbrello/umlwidgets/associationwidget.cpp
M  +9    -6    umbrello/umlwidgets/widgetbase.cpp

https://invent.kde.org/sdk/umbrello/commit/eac23da83da18c4f966e4a01b948be7404156123

-- 
You are receiving this mail because:
You are the assignee for the bug.