Merge lp:~vvort/slingshot/tooltip_fix_2 into lp:~elementary-pantheon/slingshot/trunk

Proposed by Vort on 2016-04-21
Status: Merged
Approved by: Daniel Fore on 2016-04-21
Approved revision: 644
Merged at revision: 644
Proposed branch: lp:~vvort/slingshot/tooltip_fix_2
Merge into: lp:~elementary-pantheon/slingshot/trunk
Diff against target: 33 lines (+6/-1)
2 files modified
src/Widgets/Grid.vala (+4/-1)
src/Widgets/SearchItem.vala (+2/-0)
To merge this branch: bzr merge lp:~vvort/slingshot/tooltip_fix_2
Reviewer Review Type Date Requested Status
elementary Pantheon team 2016-04-21 Pending
Review via email: mp+292575@code.launchpad.net

Commit message

Show tooltips on hover

Description of the change

Fix for lp:1444396

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Widgets/Grid.vala'
2--- src/Widgets/Grid.vala 2015-12-23 18:03:42 +0000
3+++ src/Widgets/Grid.vala 2016-04-21 18:49:23 +0000
4@@ -83,12 +83,15 @@
5 stack.add_titled (current_grid, page.number.to_string (), page.number.to_string ());
6
7 // Fake grids in case there are not enough apps to fill the grid
8- current_grid.attach (new Gtk.Grid (), 0, 0, (int)page.columns, (int)page.rows);
9+ for (var row = 0; row < page.rows; row++)
10+ for (var column = 0; column < page.columns; column++)
11+ current_grid.attach (new Gtk.Grid (), column, row, 1, 1);
12 }
13
14 public void append (Gtk.Widget widget) {
15 update_position ();
16
17+ current_grid.get_child_at ((int)current_col, (int)current_row).destroy ();
18 current_grid.attach (widget, (int)current_col, (int)current_row, 1, 1);
19 current_col++;
20 current_grid.show ();
21
22=== modified file 'src/Widgets/SearchItem.vala'
23--- src/Widgets/SearchItem.vala 2016-02-20 17:11:51 +0000
24+++ src/Widgets/SearchItem.vala 2016-04-21 18:49:23 +0000
25@@ -64,6 +64,8 @@
26 icon.gicon = app.icon;
27 icon.pixel_size = ICON_SIZE;
28
29+ tooltip_text = app.description;
30+
31 // load a favicon if we're an internet page
32 var uri_match = app.match as Synapse.UriMatch;
33 if (uri_match != null && uri_match.uri.has_prefix ("http")) {

Subscribers

People subscribed via source and target branches