From b5e7ed283685ee71588ece27254a858bf1e5ecc3 Mon Sep 17 00:00:00 2001 From: David Capello Date: Fri, 17 Mar 2017 09:13:51 -0300 Subject: [PATCH] Show close button on ColorPopup Fix regression introduced in 52375f3aa9f7c2b7fa0186be697428711b59ae1a --- src/app/ui/color_popup.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/ui/color_popup.cpp b/src/app/ui/color_popup.cpp index f49cb2ee2..7a8a7bb1f 100644 --- a/src/app/ui/color_popup.cpp +++ b/src/app/ui/color_popup.cpp @@ -47,7 +47,7 @@ enum { }; ColorPopup::ColorPopup(bool canPin) - : PopupWindowPin(std::string(), + : PopupWindowPin(" ", // Non-empty to create title-bar and close button ClickBehavior::CloseOnClickInOtherWindow, canPin) , m_vbox(VERTICAL) @@ -98,6 +98,7 @@ ColorPopup::ColorPopup(bool canPin) m_topBox.addChild(vbox); } } + setText(""); // To remove title m_vbox.addChild(&m_topBox); m_vbox.addChild(&m_colorPaletteContainer);