fix: shrink buffers when unused fraction gets too large
This commit is contained in:
@@ -24,14 +24,12 @@ static void appstate_set_tool(GtkButton* button, gpointer user_data) {
|
||||
// setting tool makes the sub-tools menu to close
|
||||
// (ADD NEW REVEALERS HERE)
|
||||
gtk_revealer_set_reveal_child(
|
||||
data->state->widgetState->workspaceRevealerShapes,
|
||||
FALSE
|
||||
);
|
||||
data->state->widgetState->workspaceRevealerShapes, FALSE);
|
||||
|
||||
// setting tool also resets selected shape
|
||||
// NOTE: isn't needed anymore, as you would
|
||||
// want to be able to select & edit existing shapes
|
||||
//data->state->selectedShape = NULL;
|
||||
// data->state->selectedShape = NULL;
|
||||
}
|
||||
|
||||
static void appstate_reveal_subtools(GtkButton* button, gpointer user_data) {
|
||||
@@ -100,7 +98,7 @@ static void canvas_onclick(GtkGestureClick* gesture, int n_press, double x,
|
||||
vektor_appstate_canvas_click(state, normalized_coords.x,
|
||||
normalized_coords.y);
|
||||
|
||||
//gtk_gl_area_queue_render(GTK_GL_AREA(widget));
|
||||
// gtk_gl_area_queue_render(GTK_GL_AREA(widget));
|
||||
}
|
||||
|
||||
void vektor_appstate_canvas_click(VektorAppState* state, double x, double y) {
|
||||
@@ -131,10 +129,10 @@ begin_click_dispatch:
|
||||
goto begin_click_dispatch; // retry
|
||||
}
|
||||
|
||||
vektor_polyline_add_point(state->selectedShape->primitive.polyline, pos);
|
||||
vektor_polyline_add_point(state->selectedShape->primitive.polyline,
|
||||
pos);
|
||||
vektor_shapes_update_bbox(state->shapeBuffer);
|
||||
}
|
||||
else if (state->selectedTool == VektorPolygonTool) {
|
||||
} else if (state->selectedTool == VektorPolygonTool) {
|
||||
// create new polygon shape if none is selected
|
||||
if (state->selectedShape == NULL) {
|
||||
|
||||
@@ -144,7 +142,8 @@ begin_click_dispatch:
|
||||
VektorStyle style = (VektorStyle){
|
||||
.stroke_color = state->currentColor, .stroke_width = 0.01};
|
||||
vektor_shapebuffer_add_shape(
|
||||
state->shapeBuffer, vektor_shape_new(polygonPrimitive, style, 0));
|
||||
state->shapeBuffer,
|
||||
vektor_shape_new(polygonPrimitive, style, 0));
|
||||
|
||||
state->selectedShape =
|
||||
&(state->shapeBuffer->shapes[state->shapeBuffer->count - 1]);
|
||||
@@ -157,36 +156,32 @@ begin_click_dispatch:
|
||||
|
||||
vektor_polygon_add_point(state->selectedShape->primitive.polygon, pos);
|
||||
vektor_shapes_update_bbox(state->shapeBuffer);
|
||||
}
|
||||
else if (state->selectedTool == VektorRectangleTool) {
|
||||
} else if (state->selectedTool == VektorRectangleTool) {
|
||||
|
||||
VektorRectangle* rect = vektor_rectangle_new();
|
||||
VektorPrimitive rectPrimitive =
|
||||
(VektorPrimitive){.kind = VEKTOR_RECTANGLE, .rectangle = *rect};
|
||||
VektorStyle style = (VektorStyle){
|
||||
.stroke_color = state->currentColor, .stroke_width = 0.01};
|
||||
vektor_shapebuffer_add_shape(
|
||||
state->shapeBuffer, vektor_shape_new(rectPrimitive, style, 0));
|
||||
VektorStyle style = (VektorStyle){.stroke_color = state->currentColor,
|
||||
.stroke_width = 0.01};
|
||||
vektor_shapebuffer_add_shape(state->shapeBuffer,
|
||||
vektor_shape_new(rectPrimitive, style, 0));
|
||||
|
||||
state->selectedShape =
|
||||
&(state->shapeBuffer->shapes[state->shapeBuffer->count - 1]);
|
||||
|
||||
vektor_rectangle_free(rect);
|
||||
|
||||
|
||||
vektor_rectangle_set_start(&state->selectedShape->primitive.rectangle, pos);
|
||||
vektor_rectangle_set_end(
|
||||
&state->selectedShape->primitive.rectangle,
|
||||
vec2_add(pos, (V2){0.1f,0.1f})
|
||||
);
|
||||
//state->selectedShape = NULL;
|
||||
vektor_rectangle_set_start(&state->selectedShape->primitive.rectangle,
|
||||
pos);
|
||||
vektor_rectangle_set_end(&state->selectedShape->primitive.rectangle,
|
||||
vec2_add(pos, (V2){0.1f, 0.1f}));
|
||||
// state->selectedShape = NULL;
|
||||
vektor_shapes_update_bbox(state->shapeBuffer);
|
||||
}
|
||||
else if (state->selectedTool == VektorSelectionTool) {
|
||||
for(size_t i = 0; i < state->shapeBuffer->count; i++) {
|
||||
VektorBBox bbox =
|
||||
vektor_primitive_get_bbox(state->shapeBuffer->shapes[i].primitive);
|
||||
if(vektor_bbox_isinside(bbox, pos)) {
|
||||
} else if (state->selectedTool == VektorSelectionTool) {
|
||||
for (size_t i = 0; i < state->shapeBuffer->count; i++) {
|
||||
VektorBBox bbox = vektor_primitive_get_bbox(
|
||||
state->shapeBuffer->shapes[i].primitive);
|
||||
if (vektor_bbox_isinside(bbox, pos)) {
|
||||
state->selectedShape = &(state->shapeBuffer->shapes[i]);
|
||||
g_print("%d", state->selectedShape == NULL);
|
||||
return;
|
||||
@@ -203,17 +198,20 @@ void vektor_appstate_new(VektorWidgetState* wstate, VektorAppState* stateOut) {
|
||||
data_linetool->tool = VektorLineTool;
|
||||
data_linetool->revealer = wstate->workspaceRevealerShapes;
|
||||
|
||||
button_tool_set_data* data_polygontool = malloc(sizeof(button_tool_set_data));
|
||||
button_tool_set_data* data_polygontool =
|
||||
malloc(sizeof(button_tool_set_data));
|
||||
data_polygontool->state = stateOut;
|
||||
data_polygontool->tool = VektorPolygonTool;
|
||||
data_polygontool->revealer = wstate->workspaceRevealerShapes;
|
||||
|
||||
button_tool_set_data* data_rectangletool = malloc(sizeof(button_tool_set_data));
|
||||
button_tool_set_data* data_rectangletool =
|
||||
malloc(sizeof(button_tool_set_data));
|
||||
data_rectangletool->state = stateOut;
|
||||
data_rectangletool->tool = VektorRectangleTool;
|
||||
data_rectangletool->revealer = wstate->workspaceRevealerShapes;
|
||||
|
||||
button_tool_set_data* data_selecttool = malloc(sizeof(button_tool_set_data));
|
||||
button_tool_set_data* data_selecttool =
|
||||
malloc(sizeof(button_tool_set_data));
|
||||
data_selecttool->state = stateOut;
|
||||
data_selecttool->tool = VektorSelectionTool;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user