Merge pull request #1255 from tsoding/1253
(#1253) Let subtract tool cut out a window inside of a platformmaster
commit
c20e7c4c62
|
@ -354,11 +354,15 @@ static int rect_layer_event_idle(RectLayer *layer,
|
||||||
|
|
||||||
Color *colors = (Color*)layer->colors.data;
|
Color *colors = (Color*)layer->colors.data;
|
||||||
|
|
||||||
if (layer->selection >= 0 &&
|
if (layer->subtract_enabled) {
|
||||||
layer->selection == rect_at_position &&
|
layer->state = RECT_LAYER_SUBTRACT;
|
||||||
(layer->resize_mask = calc_resize_mask(
|
layer->create_begin = position;
|
||||||
vec((float) event->button.x, (float)event->button.y),
|
layer->create_end = position;
|
||||||
camera_rect(camera, rects[layer->selection])))) {
|
} else if (layer->selection >= 0 &&
|
||||||
|
layer->selection == rect_at_position &&
|
||||||
|
(layer->resize_mask = calc_resize_mask(
|
||||||
|
vec((float) event->button.x, (float)event->button.y),
|
||||||
|
camera_rect(camera, rects[layer->selection])))) {
|
||||||
layer->state = RECT_LAYER_RESIZE;
|
layer->state = RECT_LAYER_RESIZE;
|
||||||
dynarray_copy_to(&layer->rects, &layer->inter_rect, (size_t) layer->selection);
|
dynarray_copy_to(&layer->rects, &layer->inter_rect, (size_t) layer->selection);
|
||||||
} else if (rect_at_position >= 0) {
|
} else if (rect_at_position >= 0) {
|
||||||
|
@ -376,9 +380,7 @@ static int rect_layer_event_idle(RectLayer *layer,
|
||||||
layer->selection = rect_at_position;
|
layer->selection = rect_at_position;
|
||||||
|
|
||||||
if (layer->selection < 0) {
|
if (layer->selection < 0) {
|
||||||
layer->state = layer->subtract_enabled
|
layer->state = RECT_LAYER_CREATE;
|
||||||
? RECT_LAYER_SUBTRACT
|
|
||||||
: RECT_LAYER_CREATE;
|
|
||||||
layer->create_begin = position;
|
layer->create_begin = position;
|
||||||
layer->create_end = position;
|
layer->create_end = position;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue