Added top toolbar options
This commit is contained in:
parent
fc8f414b67
commit
fd2ce71db6
12 changed files with 205 additions and 46 deletions
|
|
@ -782,15 +782,11 @@ void DrawingProgram::get_used_resources(std::unordered_set<NetworkingObjects::Ne
|
|||
layerMan.get_used_resources(resourceSet);
|
||||
}
|
||||
|
||||
Vector4f* DrawingProgram::color_picker_left(Vector4f* oldColor) {
|
||||
Vector4f* DrawingProgram::color_picker_color(Vector4f* oldColor) {
|
||||
if(oldColor == &world.main.toolConfig.globalConf.foregroundColor)
|
||||
return oldColor;
|
||||
else if(oldColor == &world.main.toolConfig.globalConf.backgroundColor)
|
||||
return oldColor;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
Vector4f* DrawingProgram::color_picker_right(Vector4f* oldColor) {
|
||||
return drawTool->color_picker_color(oldColor);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -58,8 +58,7 @@ class DrawingProgram {
|
|||
CanvasComponentContainer::ObjInfo* add_file_to_canvas_by_data(const std::string& fileName, std::string_view fileBuffer, Vector2f dropPos);
|
||||
void get_used_resources(std::unordered_set<NetworkingObjects::NetObjID>& resourceSet);
|
||||
|
||||
Vector4f* color_picker_left(Vector4f* oldColor);
|
||||
Vector4f* color_picker_right(Vector4f* oldColor);
|
||||
Vector4f* color_picker_color(Vector4f* oldColor);
|
||||
bool phone_gui_tool_specific_bottom_toolbar_exists();
|
||||
void phone_gui_tool_specific_bottom_toolbar(PhoneDrawingProgramScreen& t);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue