Skip to content

Commit

Permalink
Merge pull request #1 from Philip-Scott/hover-effect
Browse files Browse the repository at this point in the history
  • Loading branch information
@Philip-Scott
Philip-Scott authored Oct 29, 2018
2 parents 3f3c335 + c26680d commit d86aafc
Showing 1 changed file with 107 additions and 44 deletions.
151 changes: 107 additions & 44 deletions src/ResponsiveCanvas.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ public class Phi.ResponsiveCanvas : Goo.Canvas {
*/
public signal void item_moved (Goo.CanvasItem? item);


public weak Goo.CanvasItem? selected_item;
public weak Goo.CanvasItem? hovered_item;
public weak Goo.CanvasRect? hover_effect;

private bool holding;
private double event_x_root;
Expand All @@ -43,6 +44,8 @@ public class Phi.ResponsiveCanvas : Goo.Canvas {
private double start_y;
private double delta_x;
private double delta_y;
private double hover_x;
private double hover_y;
private double current_scale;
private int holding_id = 0;

Expand All @@ -53,6 +56,8 @@ public class Phi.ResponsiveCanvas : Goo.Canvas {
}

public override bool button_press_event (Gdk.EventButton event) {
remove_hover_effect ();

current_scale = get_scale ();
event_x_root = event.x;
event_y_root = event.y;
Expand Down Expand Up @@ -81,6 +86,7 @@ public class Phi.ResponsiveCanvas : Goo.Canvas {
}

item_moved (selected_item);
add_hover_effect (selected_item);

delta_x = 0;
delta_y = 0;
Expand All @@ -89,55 +95,112 @@ public class Phi.ResponsiveCanvas : Goo.Canvas {
}

public override bool motion_notify_event (Gdk.EventMotion event) {
if (holding) {
delta_x = (event.x - event_x_root) / current_scale;
delta_y = (event.y - event_y_root) / current_scale;
switch (holding_id) {
case 0: // Moving
((Goo.CanvasItemSimple) selected_item).x = delta_x + start_x;
((Goo.CanvasItemSimple) selected_item).y = delta_y + start_y;
break;
// case 1: // Top left
// delta_x = fix_position (x, real_width, start_w);
// delta_y = fix_position (y, real_height, start_h);
// real_height = fix_size ((int) (start_h - 1 / current_scale * y));
// real_width = fix_size ((int) (start_w - 1 / current_scale * x));
// break;
// case 2: // Top
// delta_y = fix_position (y, real_height, start_h);
// real_height = fix_size ((int)(start_h - 1 / current_scale * y));
// break;
// case 3: // Top right
// delta_y = fix_position (y, real_height, start_h);
// real_height = fix_size ((int)(start_h - 1 / current_scale * y));
// real_width = fix_size ((int)(start_w + 1 / current_scale * x));
// break;
// case 4: // Right
// real_width = fix_size ((int)(start_w + 1 / current_scale * x));
// break;
// case 5: // Bottom Right
// real_width = fix_size ((int)(start_w + 1 / current_scale * x));
// real_height = fix_size ((int)(start_h + 1 / current_scale * y));
// break;
// case 6: // Bottom
// real_height = fix_size ((int)(start_h + 1 / current_scale * y));
// break;
// case 7: // Bottom left
// real_height = fix_size ((int)(start_h + 1 / current_scale * y));
// real_width = fix_size ((int)(start_w - 1 / current_scale * x));
// delta_x = fix_position (x, real_width, start_w);
// break;
// case 8: // Left
// real_width = fix_size ((int) (start_w - 1 / current_scale * x));
// delta_x = fix_position (x, real_width, start_w);
// break;
}
if (!holding) {
motion_hover_event (event);

return false;
}

delta_x = (event.x - event_x_root) / current_scale;
delta_y = (event.y - event_y_root) / current_scale;
switch (holding_id) {
case 0: // Moving
((Goo.CanvasItemSimple) selected_item).x = delta_x + start_x;
((Goo.CanvasItemSimple) selected_item).y = delta_y + start_y;
debug ("X:%f - Y:%f\n", ((Goo.CanvasItemSimple) selected_item).x, ((Goo.CanvasItemSimple) selected_item).y);
break;
// case 1: // Top left
// delta_x = fix_position (x, real_width, start_w);
// delta_y = fix_position (y, real_height, start_h);
// real_height = fix_size ((int) (start_h - 1 / current_scale * y));
// real_width = fix_size ((int) (start_w - 1 / current_scale * x));
// break;
// case 2: // Top
// delta_y = fix_position (y, real_height, start_h);
// real_height = fix_size ((int)(start_h - 1 / current_scale * y));
// break;
// case 3: // Top right
// delta_y = fix_position (y, real_height, start_h);
// real_height = fix_size ((int)(start_h - 1 / current_scale * y));
// real_width = fix_size ((int)(start_w + 1 / current_scale * x));
// break;
// case 4: // Right
// real_width = fix_size ((int)(start_w + 1 / current_scale * x));
// break;
// case 5: // Bottom Right
// real_width = fix_size ((int)(start_w + 1 / current_scale * x));
// real_height = fix_size ((int)(start_h + 1 / current_scale * y));
// break;
// case 6: // Bottom
// real_height = fix_size ((int)(start_h + 1 / current_scale * y));
// break;
// case 7: // Bottom left
// real_height = fix_size ((int)(start_h + 1 / current_scale * y));
// real_width = fix_size ((int)(start_w - 1 / current_scale * x));
// delta_x = fix_position (x, real_width, start_w);
// break;
// case 8: // Left
// real_width = fix_size ((int) (start_w - 1 / current_scale * x));
// delta_x = fix_position (x, real_width, start_w);
// break;
}

return false;
}

private void motion_hover_event (Gdk.EventMotion event) {
hovered_item = get_item_at (event.x / get_scale (), event.y / get_scale (), true);

if (!(hovered_item is Goo.CanvasItem)) {
remove_hover_effect ();
return;
}

add_hover_effect (hovered_item);

if ((hover_x != (hovered_item as Goo.CanvasItemSimple).x
|| hover_y != (hovered_item as Goo.CanvasItemSimple).y)
&& hover_effect != hovered_item
) {
remove_hover_effect ();
}

hover_x = (hovered_item as Goo.CanvasItemSimple).x;
hover_y = (hovered_item as Goo.CanvasItemSimple).y;
}

private void add_hover_effect (Goo.CanvasItem? target) {
if (target == null || hover_effect != null) {
return;
}

var item = (target as Goo.CanvasItemSimple);

var stroke = item.line_width;
var x = item.x - stroke;
var y = item.y - stroke;
var width = item.bounds.x2 - item.bounds.x1 + stroke;
var height = item.bounds.y2 - item.bounds.y1 + stroke;

var line_width = 2.0 / get_scale ();

hover_effect = Goo.CanvasRect.create (get_root_item (), x, y, width, height,
"line-width", line_width,
"stroke-color", "#41c9fd"
);

hover_effect.can_focus = false;
}

private void remove_hover_effect () {
if (hover_effect == null) {
return;
}

hover_effect.remove ();
hover_effect = null;
}

// To make it so items can't become imposible to grab. TODOs
private int fix_position (int delta, int length, int initial_length) {
var max_delta = (initial_length - MIN_SIZE) * current_scale;
Expand Down

0 comments on commit d86aafc

Please sign in to comment.