Readded layer menu and fixed color picker button
This commit is contained in:
parent
267a66dd32
commit
516f48993e
7 changed files with 586 additions and 522 deletions
|
|
@ -12,21 +12,26 @@ class DrawingProgramLayerManagerGUI {
|
|||
public:
|
||||
DrawingProgramLayerManagerGUI(DrawingProgramLayerManager& layerManager);
|
||||
void refresh_gui_data();
|
||||
void setup_list_gui(const char* id, bool& hoveringOverDropdown);
|
||||
void setup_list_gui();
|
||||
private:
|
||||
std::optional<std::pair<NetworkingObjects::NetObjID, NetworkingObjects::NetObjOrderedListIterator<DrawingProgramLayerListItem>>> try_to_create_in_proper_position(DrawingProgramLayerListItem* newItem);
|
||||
std::pair<NetworkingObjects::NetObjID, NetworkingObjects::NetObjOrderedListIterator<DrawingProgramLayerListItem>> create_in_proper_position(DrawingProgramLayerListItem* newItem);
|
||||
NetworkingObjects::NetObjOrderedListIterator<DrawingProgramLayerListItem> create_layer(DrawingProgramLayerListItem* newItem);
|
||||
void remove_layer(const NetworkingObjects::NetObjID& parentID, const NetworkingObjects::NetObjID& objectID);
|
||||
void remove_layer(const GUIStuff::TreeListingObjIndexList& objIndex);
|
||||
void editing_layer_check();
|
||||
|
||||
std::unordered_set<NetworkingObjects::NetObjID> oldSelection;
|
||||
NetworkingObjects::NetObjTemporaryPtr<DrawingProgramLayerListItem> get_layer_parent_from_obj_index(const GUIStuff::TreeListingObjIndexList& objIndex);
|
||||
NetworkingObjects::NetObjTemporaryPtr<DrawingProgramLayerListItem> get_layer_from_obj_index(const GUIStuff::TreeListingObjIndexList& objIndex);
|
||||
|
||||
std::string nameToEdit;
|
||||
std::string nameForNew;
|
||||
float alphaValToEdit = 0.0f;
|
||||
size_t blendModeValToEdit = 0;
|
||||
|
||||
std::optional<DrawingProgramLayerListItemMetaInfo> editingData;
|
||||
std::set<GUIStuff::TreeListingObjIndexList> selectedLayerIndices;
|
||||
NetworkingObjects::NetObjTemporaryPtr<DrawingProgramLayerListItem> editingLayer;
|
||||
|
||||
std::optional<DrawingProgramLayerListItemMetaInfo> editingLayerOldMetainfo;
|
||||
|
||||
DrawingProgramLayerManager& layerMan;
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue