Skip to content

Commit e873ee5

Browse files
committed
show parent/child relationships on hover
1 parent 589e794 commit e873ee5

File tree

7 files changed

+30
-14
lines changed

7 files changed

+30
-14
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
- add `nip4-batch` batch mode interface
1010
- fix tests
1111
- remove ^C/^V in mainwindow
12+
- show parent/child row relationships on hover
1213

1314
## 9.0.0-10 29025/02/18
1415

TODO

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
- add row label colour change for parent/child relationships
2-
31
- open test.ws, edit defs, "main = 12;", process, ws is not marked as modified
42

53
- check all batch mode flags

src/gtk/nip4.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
background-color: #5D7555;
33
}
44

5+
.parent_widget {
6+
background-color: #1F4151;
7+
}
8+
9+
.child_widget {
10+
background-color: #421F51;
11+
}
12+
513
.selected_widget {
614
background-color: #83A67F;
715
}

src/gtk/rowview.ui

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,14 @@
3030
<child>
3131
<object class="GtkGestureClick">
3232
<property name="button">1</property>
33-
<signal name="pressed" handler="rowview_click"/>
33+
<signal name="pressed" handler="rowview_pressed"/>
34+
</object>
35+
</child>
36+
37+
<child>
38+
<object class="GtkEventControllerMotion">
39+
<signal name="enter" handler="rowview_enter"/>
40+
<signal name="leave" handler="rowview_leave"/>
3441
</object>
3542
</child>
3643

src/gtk/workspaceview.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<child>
9595
<object class="GtkGestureClick">
9696
<property name="button">1</property>
97-
<signal name="pressed" handler="workspaceview_click"/>
97+
<signal name="pressed" handler="workspaceview_pressed"/>
9898
</object>
9999
</child>
100100

src/rowview.c

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ rowview_edit(Rowview *rview)
279279
}
280280

281281
static void
282-
rowview_click(GtkGestureClick *gesture,
282+
rowview_pressed(GtkGestureClick *gesture,
283283
guint n_press, double x, double y, Rowview *rview)
284284
{
285285
Row *row = ROW(VOBJECT(rview)->iobject);
@@ -324,23 +324,23 @@ rowview_down_click(GtkGestureClick *gesture, Rowview *rview)
324324
workspace_set_modified(row->ws, TRUE);
325325
}
326326

327-
/*
328327
static void
329-
rowview_enter_cb(GtkWidget *widget, Rowview *rview)
328+
rowview_enter(GtkWidget *widget, Rowview *rview)
330329
{
331330
Row *row = ROW(VOBJECT(rview)->iobject);
332331

333332
row_show_dependents(row);
334333
}
335334

336335
static void
337-
rowview_leave_cb(GtkWidget *widget, Rowview *rview)
336+
rowview_leave(GtkWidget *widget, Rowview *rview)
338337
{
339338
Row *row = ROW(VOBJECT(rview)->iobject);
340339

341340
row_hide_dependents(row);
342341
}
343342

343+
/*
344344
static gboolean
345345
rowview_focus_cb(GtkWidget *widget, GtkDirectionType dir, Rowview *rview)
346346
{
@@ -494,14 +494,16 @@ rowview_class_init(RowviewClass *class)
494494
BIND_RESOURCE("rowview.ui");
495495
BIND_LAYOUT();
496496

497-
BIND_CALLBACK(rowview_click);
498-
BIND_CALLBACK(rowview_up_click);
499-
BIND_CALLBACK(rowview_down_click);
500-
501497
BIND_VARIABLE(Rowview, spin);
502498
BIND_VARIABLE(Rowview, frame);
503499
BIND_VARIABLE(Rowview, label);
504500

501+
BIND_CALLBACK(rowview_pressed);
502+
BIND_CALLBACK(rowview_up_click);
503+
BIND_CALLBACK(rowview_down_click);
504+
BIND_CALLBACK(rowview_enter);
505+
BIND_CALLBACK(rowview_leave);
506+
505507
/* Create signals.
506508
*/
507509

src/workspaceview.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@ workspaceview_action(GSimpleAction *action, GVariant *parameter, View *view)
862862
}
863863

864864
static void
865-
workspaceview_click(GtkGestureClick *gesture,
865+
workspaceview_pressed(GtkGestureClick *gesture,
866866
guint n_press, double x, double y, Workspaceview *wview)
867867
{
868868
Columnview *cview = workspaceview_find_columnview(wview, x, y);
@@ -1264,7 +1264,7 @@ workspaceview_class_init(WorkspaceviewClass *class)
12641264
BIND_VARIABLE(Workspaceview, fixed);
12651265
BIND_VARIABLE(Workspaceview, workspacedefs);
12661266

1267-
BIND_CALLBACK(workspaceview_click);
1267+
BIND_CALLBACK(workspaceview_pressed);
12681268
BIND_CALLBACK(workspaceview_drag_begin);
12691269
BIND_CALLBACK(workspaceview_drag_update);
12701270
BIND_CALLBACK(workspaceview_drag_end);

0 commit comments

Comments
 (0)