Files

Merge lp:~junrrein/pantheon-files/fix-1015228 into lp:~elementary-apps/pantheon-files/trunk

  1. fix-1015228
  2. Merge into trunk
Proposed by Julián Unrrein
Status: Merged
Approved by: Cody Garver
Approved revision: 1244
Merged at revision: 1246
Proposed branch: lp:~junrrein/pantheon-files/fix-1015228
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 15 lines (+0/-6)
1 file modified
src/fm-directory-view.c (+0/-6)
To merge this branch: bzr merge lp:~junrrein/pantheon-files/fix-1015228
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+171708@code.launchpad.net

Commit message

Disable changing the zoom level when entering an icons folder.

Description of the change

Disable changing the zoom level when entering an icons folder.

To test this, go to any folder like "/usr/share/icons/xxx/xxx/number", where "number" can be any number, and is generally the size of all icons contained inside that folder.

For example: "/usr/share/icons/elementary/apps/128".

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/fm-directory-view.c'
2--- src/fm-directory-view.c 2013-05-27 22:20:15 +0000
3+++ src/fm-directory-view.c 2013-06-27 03:30:39 +0000
4@@ -2838,12 +2838,6 @@
5 g_signal_connect_object (gof_preferences_get_default (), "notify::interpret-desktop-files",
6 G_CALLBACK (show_desktop_files_changed), view, 0);
7
8- /* automagicly zoom if we have a valid keypath_size */
9- int keypath_size = fm_directory_view_get_uri_keypath_size (view);
10- if (keypath_size != 0) {
11- MarlinZoomLevel zoom = marlin_zoom_level_get_nearest_from_value (keypath_size);
12- g_object_set (G_OBJECT (view), "zoom-level", zoom, NULL);
13- }
14
15 fm_directory_view_connect_directory_handlers (view, slot->directory);
16

Subscribers

People subscribed via source and target branches

to all changes: