New Features: Window Resize, Window Snap, horizontal scroll, treeview, folderdialog, bottom Popup

CMakeLists.txt

@@ -359,8 +359,10 @@ add_library(nanogui ${NANOGUI_LIBRARY_TYPE}
   include/nanogui/messagedialog.h src/messagedialog.cpp
   include/nanogui/textbox.h src/textbox.cpp
   include/nanogui/textarea.h src/textarea.cpp
+  include/nanogui/treeview.h src/treeview.cpp
+  include/nanogui/folderdialog.h src/folderdialog.cpp
   include/nanogui/imagepanel.h src/imagepanel.cpp
-  include/nanogui/vscrollpanel.h src/vscrollpanel.cpp
+  include/nanogui/scrollpanel.h src/scrollpanel.cpp
   include/nanogui/colorwheel.h src/colorwheel.cpp
   include/nanogui/colorpicker.h src/colorpicker.cpp
   include/nanogui/graph.h src/graph.cpp

include/nanogui/button.h

@@ -1,158 +1,167 @@
-/*
-    NanoGUI was developed by Wenzel Jakob <[email protected]>.
-    The widget drawing code is based on the NanoVG demo application
-    by Mikko Mononen.
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE.txt file.
-*/
-/**
- * \file nanogui/button.h
- *
- * \brief Defines the [Normal/Toggle/Radio/Popup] \ref nanogui::Button widget.
- */
-
-#pragma once
-
-#include <nanogui/widget.h>
-
-NAMESPACE_BEGIN(nanogui)
-/**
- * \class Button button.h nanogui/button.h
- *
- * \brief [Normal/Toggle/Radio/Popup] Button widget.
- */
-class NANOGUI_EXPORT Button : public Widget {
-public:
-    /// Flags to specify the button behavior (can be combined with binary OR)
-    enum Flags {
-        NormalButton = (1 << 0), ///< A normal button.
-        RadioButton  = (1 << 1), ///< A radio button.
-        ToggleButton = (1 << 2), ///< A toggle button.
-        PopupButton  = (1 << 3), ///< A popup button.
-        MenuButton   = (1 << 4)  ///< A menu button.
-    };
-
-    /// The available icon positions.
-    enum class IconPosition {
-        Left,         ///< Button icon on the far left.
-        LeftCentered, ///< Button icon on the left, centered (depends on caption text length).
-        RightCentered,///< Button icon on the right, centered (depends on caption text length).
-        Right         ///< Button icon on the far right.
-    };
-
-    /**
-     * \brief Creates a button attached to the specified parent.
-     *
-     * \param parent
-     *     The \ref nanogui::Widget this Button will be attached to.
-     *
-     * \param caption
-     *     The name of the button (default ``"Untitled"``).
-     *
-     * \param icon
-     *     The icon to display with this Button.  See \ref nanogui::Button::mIcon.
-     */
-    Button(Widget *parent, const std::string &caption = "Untitled", int icon = 0);
-
-    /// Returns the caption of this Button.
-    const std::string &caption() const { return m_caption; }
-
-    /// Sets the caption of this Button.
-    void set_caption(const std::string &caption) { m_caption = caption; }
-
-    /// Returns the background color of this Button.
-    const Color &background_color() const { return m_background_color; }
-    /// Sets the background color of this Button.
-    void set_background_color(const Color &background_color) { m_background_color = background_color; }
-
-    /// Returns the text color of the caption of this Button.
-    const Color &text_color() const { return m_text_color; }
-    /// Sets the text color of the caption of this Button.
-    void set_text_color(const Color &text_color) { m_text_color = text_color; }
-
-    /// Returns the icon of this Button.  See \ref nanogui::Button::m_icon.
-    int icon() const { return m_icon; }
-    /// Sets the icon of this Button.  See \ref nanogui::Button::m_icon.
-    void set_icon(int icon) { m_icon = icon; }
-
-    /// The current flags of this Button (see \ref nanogui::Button::Flags for options).
-    int flags() const { return m_flags; }
-    /// Sets the flags of this Button (see \ref nanogui::Button::Flags for options).
-    void set_flags(int button_flags) { m_flags = button_flags; }
-
-    /// The position of the icon for this Button.
-    IconPosition icon_position() const { return m_icon_position; }
-    /// Sets the position of the icon for this Button.
-    void set_icon_position(IconPosition icon_position) { m_icon_position = icon_position; }
-
-    /// Whether or not this Button is currently pushed.
-    bool pushed() const { return m_pushed; }
-    /// Sets whether or not this Button is currently pushed.
-    void set_pushed(bool pushed) { m_pushed = pushed; }
-
-    /// Return the push callback (for any type of button)
-    std::function<void()> callback() const { return m_callback; }
-    /// Set the push callback (for any type of button).
-    void set_callback(const std::function<void()> &callback) { m_callback = callback; }
-
-    /// Return the change callback (for toggle buttons)
-    std::function<void(bool)> change_callback() const { return m_change_callback; }
-    /// Set the change callback (for toggle buttons).
-    void set_change_callback(const std::function<void(bool)> &callback) { m_change_callback = callback; }
-
-    /// Return the button group (for radio buttons)
-    const std::vector<Button *> &button_group() const { return m_button_group; }
-    /// Set the button group (for radio buttons)
-    void set_button_group(const std::vector<Button *> &button_group) { m_button_group = button_group; }
-
-    /// The preferred size of this Button.
-    virtual Vector2i preferred_size(NVGcontext *ctx) const override;
-    /// The callback that is called when any type of mouse button event is issued to this Button.
-    virtual bool mouse_enter_event(const Vector2i &p, bool enter) override;
-    virtual bool mouse_button_event(const Vector2i &p, int button, bool down, int modifiers) override;
-    /// Responsible for drawing the Button.
-    virtual void draw(NVGcontext *ctx) override;
-protected:
-    /// The caption of this Button.
-    std::string m_caption;
-
-    /**
-     * \brief The icon of this Button (``0`` means no icon).
-     *
-     * \rst
-     * The icon to display with this Button.  If not ``0``, may either be a
-     * picture icon, or one of the icons enumerated in
-     * :ref:`file_nanogui_entypo.h`.  The kind of icon (image or Entypo)
-     * is determined by the functions :func:`nanogui::nvgIsImageIcon` and its
-     * reciprocal counterpart :func:`nanogui::nvgIsFontIcon`.
-     * \endrst
-     */
-    int m_icon;
-
-    /// The position to draw the icon at.
-    IconPosition m_icon_position;
-
-    /// Whether or not this Button is currently pushed.
-    bool m_pushed;
-
-    /// The current flags of this button (see \ref nanogui::Button::Flags for options).
-    int m_flags;
-
-    /// The background color of this Button.
-    Color m_background_color;
-
-    /// The color of the caption text of this Button.
-    Color m_text_color;
-
-    /// The callback issued for all types of buttons.
-    std::function<void()> m_callback;
-
-    /// The callback issued for toggle buttons.
-    std::function<void(bool)> m_change_callback;
-
-    /// The button group for radio buttons.
-    std::vector<Button *> m_button_group;
-};
-
-NAMESPACE_END(nanogui)
+/*
+    NanoGUI was developed by Wenzel Jakob <[email protected]>.
+    The widget drawing code is based on the NanoVG demo application
+    by Mikko Mononen.
+
+    All rights reserved. Use of this source code is governed by a
+    BSD-style license that can be found in the LICENSE.txt file.
+*/
+/**
+ * \file nanogui/button.h
+ *
+ * \brief Defines the [Normal/Toggle/Radio/Popup] \ref nanogui::Button widget.
+ */
+
+#pragma once
+
+#include <nanogui/widget.h>
+
+NAMESPACE_BEGIN(nanogui)
+/**
+ * \class Button button.h nanogui/button.h
+ *
+ * \brief [Normal/Toggle/Radio/Popup] Button widget.
+ */
+    class NANOGUI_EXPORT Button : public Widget {
+    public:
+        /// Flags to specify the button behavior (can be combined with binary OR)
+        enum Flags {
+            NormalButton = (1 << 0), ///< A normal button.
+            RadioButton = (1 << 1), ///< A radio button.
+            ToggleButton = (1 << 2), ///< A toggle button.
+            PopupButton = (1 << 3), ///< A popup button.
+            MenuButton = (1 << 4)  ///< A menu button.
+        };
+
+        /// The available icon positions.
+        enum class IconPosition {
+            Left,         ///< Button icon on the far left.
+            LeftCentered, ///< Button icon on the left, centered (depends on caption text length).
+            RightCentered,///< Button icon on the right, centered (depends on caption text length).
+            Right         ///< Button icon on the far right.
+        };
+
+        /**
+         * \brief Creates a button attached to the specified parent.
+         *
+         * \param parent
+         *     The \ref nanogui::Widget this Button will be attached to.
+         *
+         * \param caption
+         *     The name of the button (default ``"Untitled"``).
+         *
+         * \param icon
+         *     The icon to display with this Button.  See \ref nanogui::Button::mIcon.
+         */
+        Button(Widget* parent, const std::string& caption = "Untitled", int icon = 0);
+
+        /// Returns the caption of this Button.
+        const std::string& caption() const { return m_caption; }
+
+        /// Sets the caption of this Button.
+        void set_caption(const std::string& caption) { m_caption = caption; }
+
+        /// Returns the background color of this Button.
+        const Color& background_color() const { return m_background_color; }
+        /// Sets the background color of this Button.
+        void set_background_color(const Color& background_color) { m_background_color = background_color; }
+
+        /// Returns the transparency boolean
+        const bool& transparent() const { return m_make_transparent; }
+        /// Sets the transprency boolean. used to override the unfocused color with the window fill.
+        void set_transparent(const bool& make_transparent) { m_make_transparent = make_transparent; }
+
+        /// Returns the text color of the caption of this Button.
+        const Color& text_color() const { return m_text_color; }
+        /// Sets the text color of the caption of this Button.
+        void set_text_color(const Color& text_color) { m_text_color = text_color; }
+
+        /// Returns the icon of this Button.  See \ref nanogui::Button::m_icon.
+        int icon() const { return m_icon; }
+        /// Sets the icon of this Button.  See \ref nanogui::Button::m_icon.
+        void set_icon(int icon) { m_icon = icon; }
+
+        /// The current flags of this Button (see \ref nanogui::Button::Flags for options).
+        int flags() const { return m_flags; }
+        /// Sets the flags of this Button (see \ref nanogui::Button::Flags for options).
+        void set_flags(int button_flags) { m_flags = button_flags; }
+
+        /// The position of the icon for this Button.
+        IconPosition icon_position() const { return m_icon_position; }
+        /// Sets the position of the icon for this Button.
+        void set_icon_position(IconPosition icon_position) { m_icon_position = icon_position; }
+
+        /// Whether or not this Button is currently pushed.
+        bool pushed() const { return m_pushed; }
+        /// Sets whether or not this Button is currently pushed.
+        virtual void set_pushed(bool pushed) { 
+            m_pushed = pushed; }
+
+        /// Return the push callback (for any type of button)
+        std::function<void()> callback() const { return m_callback; }
+        /// Set the push callback (for any type of button).
+        void set_callback(const std::function<void()>& callback) { m_callback = callback; }
+
+        /// Return the change callback (for toggle buttons)
+        std::function<void(bool)> change_callback() const { return m_change_callback; }
+        /// Set the change callback (for toggle buttons).
+        void set_change_callback(const std::function<void(bool)>& callback) { m_change_callback = callback; }
+
+        /// Return the button group (for radio buttons)
+        const std::vector<Button*>& button_group() const { return m_button_group; }
+        /// Set the button group (for radio buttons)
+        void set_button_group(const std::vector<Button*>& button_group) { m_button_group = button_group; }
+
+        /// The preferred size of this Button.
+        virtual Vector2i preferred_size(NVGcontext* ctx) const override;
+        /// The callback that is called when any type of mouse button event is issued to this Button.
+        virtual bool mouse_enter_event(const Vector2i& p, bool enter) override;
+        virtual bool mouse_button_event(const Vector2i& p, int button, bool down, int modifiers) override;
+        /// Responsible for drawing the Button.
+        virtual void draw(NVGcontext* ctx) override;
+    protected:
+        /// The caption of this Button.
+        std::string m_caption;
+
+        /**
+         * \brief The icon of this Button (``0`` means no icon).
+         *
+         * \rst
+         * The icon to display with this Button.  If not ``0``, may either be a
+         * picture icon, or one of the icons enumerated in
+         * :ref:`file_nanogui_entypo.h`.  The kind of icon (image or Entypo)
+         * is determined by the functions :func:`nanogui::nvgIsImageIcon` and its
+         * reciprocal counterpart :func:`nanogui::nvgIsFontIcon`.
+         * \endrst
+         */
+        int m_icon;
+
+        /// The position to draw the icon at.
+        IconPosition m_icon_position;
+
+        /// Whether or not this Button is currently pushed.
+        bool m_pushed;
+
+        /// The current flags of this button (see \ref nanogui::Button::Flags for options).
+        int m_flags;
+
+        /// The background color of this Button.
+        Color m_background_color;
+
+        /// override button color with the window fill
+        bool m_make_transparent;
+
+        /// The color of the caption text of this Button.
+        Color m_text_color;
+
+        /// The callback issued for all types of buttons.
+        std::function<void()> m_callback;
+
+        /// The callback issued for toggle buttons.
+        std::function<void(bool)> m_change_callback;
+
+        /// The button group for radio buttons.
+        std::vector<Button*> m_button_group;
+};
+
+NAMESPACE_END(nanogui)

include/nanogui/combobox.h

@@ -63,7 +63,7 @@ class NANOGUI_EXPORT ComboBox : public PopupButton {
     virtual bool scroll_event(const Vector2i &p, const Vector2f &rel) override;
 protected:
     /// Scroll panel used to store the combo box contents
-    VScrollPanel *m_scroll = nullptr;
+    ScrollPanel *m_scroll = nullptr;
 
     /// Container containing the buttons
     Widget *m_container = nullptr;