# Changes 0.3.1
- Add Layout API and let Menu use it - Add DragData (for float, double, int, etc) - Add IO Delta calculation to not require a users delta value - Add Config Var for SLider drag min size - Remove Hid::Ref input of Containers as IO DragApi is used - Containers that accept input will require an ID to function
This commit is contained in:
		| @@ -54,9 +54,8 @@ class Button : public Container { | ||||
|   /** | ||||
|    * Override for the Input Handler | ||||
|    * @note This function is usally called by Menu::Update | ||||
|    * @param inp Reference to the Input Handler | ||||
|    */ | ||||
|   void HandleInput(Hid::Ref inp) override; | ||||
|   void HandleInput() override; | ||||
|   /** | ||||
|    * Override for the Rendering Handler | ||||
|    * @note This function is usally called by Menu::Update | ||||
|   | ||||
| @@ -50,9 +50,8 @@ class Checkbox : public Container { | ||||
|   /** | ||||
|    * Override for the Input Handler | ||||
|    * @note This function is usally called by Menu::Update | ||||
|    * @param inp Reference to the Input Handler | ||||
|    */ | ||||
|   void HandleInput(Hid::Ref inp) override; | ||||
|   void HandleInput() override; | ||||
|   /** | ||||
|    * Override for the Rendering Handler | ||||
|    * @note This function is usally called by Menu::Update | ||||
|   | ||||
| @@ -25,6 +25,7 @@ SOFTWARE. | ||||
|  | ||||
| #include <pd/ui7/container/container.hpp> | ||||
| #include <pd/ui7/io.hpp> | ||||
| #include <pd/ui7/layout.hpp> | ||||
|  | ||||
| namespace PD { | ||||
| namespace UI7 { | ||||
| @@ -51,9 +52,8 @@ class ColorEdit : public Container { | ||||
|   /** | ||||
|    * Override for the Input Handler | ||||
|    * @note This function is usally called by Menu::Update | ||||
|    * @param inp Reference to the Input Handler | ||||
|    */ | ||||
|   void HandleInput(Hid::Ref inp) override; | ||||
|   void HandleInput() override; | ||||
|   /** | ||||
|    * Override for the Rendering Handler | ||||
|    * @note This function is usally called by Menu::Update | ||||
| @@ -68,6 +68,8 @@ class ColorEdit : public Container { | ||||
|   u32* color_ref = nullptr;  ///< Color Reference | ||||
|   u32 initial_color;         ///< Initial Color | ||||
|   std::string label;         ///< Label of the Button | ||||
|   Layout::Ref layout;        ///< Layout to open | ||||
|   bool is_shown = false;     ///< AHow Layout Editor | ||||
| }; | ||||
| }  // namespace UI7 | ||||
| }  // namespace PD | ||||
| @@ -103,7 +103,7 @@ class Container : public SmartCtor<Container> { | ||||
|    */ | ||||
|   void HandleScrolling(vec2 scrolling, vec4 viewport); | ||||
|   /** Template function for Input Handling */ | ||||
|   virtual void HandleInput(Hid::Ref inp) {} | ||||
|   virtual void HandleInput() {} | ||||
|   /** Tamplate function for Object rendering */ | ||||
|   virtual void Draw() {} | ||||
|   /** Template function to update internal data (if needed) */ | ||||
|   | ||||
							
								
								
									
										79
									
								
								include/pd/ui7/container/dragdata.hpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										79
									
								
								include/pd/ui7/container/dragdata.hpp
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,79 @@ | ||||
| #pragma once | ||||
|  | ||||
| /* | ||||
| MIT License | ||||
| Copyright (c) 2024 - 2025 René Amthor (tobid7) | ||||
|  | ||||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||||
| of this software and associated documentation files (the "Software"), to deal | ||||
| in the Software without restriction, including without limitation the rights | ||||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||||
| copies of the Software, and to permit persons to whom the Software is | ||||
| furnished to do so, subject to the following conditions: | ||||
|  | ||||
| The above copyright notice and this permission notice shall be included in all | ||||
| copies or substantial portions of the Software. | ||||
|  | ||||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||||
| SOFTWARE. | ||||
|  */ | ||||
|  | ||||
| #include <pd/ui7/container/container.hpp> | ||||
| #include <pd/ui7/io.hpp> | ||||
|  | ||||
| namespace PD { | ||||
| namespace UI7 { | ||||
| /** | ||||
|  * DragData Object can take a datatype or a list | ||||
|  * and modifys these by moving left or right when dragging | ||||
|  */ | ||||
| template <typename T> | ||||
| class DragData : public Container { | ||||
|  public: | ||||
|   /** | ||||
|    * Constructor | ||||
|    * @param label Label of the Button | ||||
|    * @param pos Base Position | ||||
|    * @param lr Reference to the Renderer | ||||
|    */ | ||||
|   DragData(const std::string& label, T* data, size_t num_elms, UI7::IO::Ref io, | ||||
|            T min = 0, T max = 100) { | ||||
|     PD::Assert(data != nullptr, "Input Data Address is null!"); | ||||
|     this->label = label; | ||||
|     this->data = data; | ||||
|     this->elm_count = num_elms; | ||||
|     this->min = min; | ||||
|     this->max = max; | ||||
|     this->tdim = io->Ren->GetTextDimensions(label); | ||||
|   } | ||||
|   ~DragData() = default; | ||||
|  | ||||
|   /** | ||||
|    * Override for the Input Handler | ||||
|    * @note This function is usally called by Menu::Update | ||||
|    */ | ||||
|   void HandleInput() override; | ||||
|   /** | ||||
|    * Override for the Rendering Handler | ||||
|    * @note This function is usally called by Menu::Update | ||||
|    * */ | ||||
|   void Draw() override; | ||||
|  | ||||
|   /** Function to Update Size if framepadding changes */ | ||||
|   void Update() override; | ||||
|  | ||||
|  private: | ||||
|   vec2 tdim;          ///< Text size | ||||
|   std::string label;  ///< Label of the Button | ||||
|   T* data; | ||||
|   size_t elm_count = 0; | ||||
|   T min; | ||||
|   T max; | ||||
| }; | ||||
| }  // namespace UI7 | ||||
| }  // namespace PD | ||||
		Reference in New Issue
	
	Block a user