# Changes
- Remove () from vec formatter -Add Merge function to DrawList to Move Data into the Current DrawList - Fix stupid bug in Rect.hpp which caused some problems in line rendering - Remove some unused UI7 Flags - io: Allocate FinalDrawList and add GetViewPort func - Readd TreeNodes to Menu - Add ABout/Style and Metrics Menu to Context - Add some Variables for cliprects in ui7 container.hpp - Add InputHandler functionality to DynObj - Fix Menu Layout Render Order - Add Better Menu Sorting to Context # ppam - Use stringview instead of hardcoded const char* # Todos - Work on the Lithium 3D System - Fix UI7 Menu Order to Pop new Menus into the front instead of the background - Add Scrolling support to menu (or integrate it into layout maybe)
This commit is contained in:
@ -63,6 +63,11 @@ class PD_UI7_API Container {
|
||||
// this->screen = io->Ren->CurrentScreen();
|
||||
}
|
||||
|
||||
void SetClipRect(fvec4 clip) {
|
||||
pClipRect = clip;
|
||||
pCLipRectUsed = true;
|
||||
}
|
||||
|
||||
/** Setter for Position */
|
||||
void SetPos(const fvec2& pos) { this->pos = pos; }
|
||||
/** Setter for Size */
|
||||
@ -161,6 +166,10 @@ class PD_UI7_API Container {
|
||||
bool pPressed = false;
|
||||
/** Was Pressed Twice */
|
||||
bool pPressedTwice = false;
|
||||
/** ClipRect */
|
||||
fvec4 pClipRect;
|
||||
/** Clip Rect used */
|
||||
bool pCLipRectUsed = false;
|
||||
};
|
||||
} // namespace UI7
|
||||
} // namespace PD
|
||||
|
@ -52,6 +52,10 @@ class PD_UI7_API DynObj : public Container {
|
||||
|
||||
PD_SHARED(DynObj);
|
||||
|
||||
void AddInputHandler(std::function<void(UI7::IO::Ref, Container*)> inp) {
|
||||
pInp = inp;
|
||||
}
|
||||
|
||||
/** Return true if butten is pressed*/
|
||||
bool IsPressed() { return pressed; }
|
||||
/**
|
||||
@ -72,6 +76,7 @@ class PD_UI7_API DynObj : public Container {
|
||||
UI7Color color = UI7Color_Button; ///< current button color
|
||||
bool pressed = false; ///< ispressed value
|
||||
std::function<void(UI7::IO::Ref, Li::DrawList::Ref, Container*)> pRenFun;
|
||||
std::function<void(UI7::IO::Ref, Container*)> pInp;
|
||||
};
|
||||
} // namespace UI7
|
||||
} // namespace PD
|
Reference in New Issue
Block a user