[aseprite] 82/308: Add possibility to create popup windows and tip windows from XML widgets

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 50a01879ac028a48fc82edb06a1db3a88291e01b
Author: David Capello <davidcapello at gmail.com>
Date:   Thu Dec 10 16:51:48 2015 -0300

    Add possibility to create popup windows and tip windows from XML widgets
---
 src/gen/ui_class.cpp  | 2 ++
 src/ui/popup_window.h | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gen/ui_class.cpp b/src/gen/ui_class.cpp
index dcbeb74..757745e 100644
--- a/src/gen/ui_class.cpp
+++ b/src/gen/ui_class.cpp
@@ -63,10 +63,12 @@ static std::string convert_type(const std::string& name)
   if (name == "link") return "ui::LinkLabel";
   if (name == "listbox") return "ui::ListBox";
   if (name == "panel") return "ui::Panel";
+  if (name == "popupwindow") return "ui::PopupWindow";
   if (name == "radio") return "ui::RadioButton";
   if (name == "search") return "app::SearchEntry";
   if (name == "slider") return "ui::Slider";
   if (name == "splitter") return "ui::Splitter";
+  if (name == "tipwindow") return "ui::TipWindow";
   if (name == "vbox") return "ui::VBox";
   if (name == "view") return "ui::View";
   if (name == "window") return "ui::Window";
diff --git a/src/ui/popup_window.h b/src/ui/popup_window.h
index 390719f..b2104d5 100644
--- a/src/ui/popup_window.h
+++ b/src/ui/popup_window.h
@@ -25,8 +25,8 @@ namespace ui {
       CloseOnEnter,
     };
 
-    PopupWindow(const std::string& text,
-                ClickBehavior clickBehavior,
+    PopupWindow(const std::string& text = "",
+                ClickBehavior clickBehavior = ClickBehavior::CloseOnClickOutsideHotRegion,
                 EnterBehavior enterBehavior = EnterBehavior::CloseOnEnter);
     ~PopupWindow();
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git