← Back to branch summary

~ubuntu-branches/ubuntu/raring/nautilus/raring

« back to all changes in this revision

Viewing changes to libnautilus-private/nautilus-icon-container.c

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Jeremy Bicha
  • Date: 2012-01-31 13:45:01 UTC
  • mfrom: (1.17.25)
  • Revision ID: package-import@ubuntu.com-20120131134501-yn7mqny7fgzx9fao
Tags: 1:3.3.4-0ubuntu1
https://launchpad.net/bugs/126540
https://launchpad.net/bugs/61786
https://launchpad.net/bugs/503330
https://launchpad.net/bugs/846289
https://launchpad.net/bugs/575719
https://launchpad.net/bugs/230098
* New upstream version which fixes:
  - "Opening Popupmenu in Context of Folder with List-View impossible?"
    (lp: #126540)
  - "'Create folder in here' context menu option for nautilus" (lp: #61786)
  - the file count and the size count change in opposite direction.
    (lp: #503330)
  - the mounts in the place menu should have a properties entry.
    (lp: #846289)
  - add command line option to select file (lp: #575719)
  - Media in 'Places' side bar should have same context menu as in 
    'Computer' (lp: #230098)
* debian/nautilus-data.install:
  - updated, ui and icons have been moved into gresources
* debian/patches/05_desktop_menu_export.patch:
   - updated to correctly include the gresources desktop definition

[ Jeremy Bicha ]
* New upstream release.
* debian/control.in:
  - Bump minimum GTK and glib
* Refreshed patches
* Dropped upstream patches:
  - 17_dont_allow_new_tab_on_desktop.patch
  - 18_fix_crash_in_get_current_uri.patch
  - 19_lazily_initialize_notification_service.patch
  - git_sideplace_sorting.patch
  - git_next_row.patch
  - git_dont_document_browser_option.patch
  - git_browser_compat.patch
  - git_bookmarks_reordering.patch
  - git_listview_context_menus.patch
  - git_use_gtk_grid.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
libnautilus-private/nautilus-icon-container.c
55
55
/* Interval for updating the rubberband selection, in milliseconds.  */
56
56
#define RUBBERBAND_TIMEOUT_INTERVAL 10
57
57
 
 
58
#define RUBBERBAND_SCROLL_THRESHOLD 5
 
59
 
58
60
/* Initial unpositioned icon value */
59
61
#define ICON_UNPOSITIONED_VALUE -1
60
62
 
2521
2523
                adj_changed = TRUE;
2522
2524
        }
2523
2525
 
2524
 
        gtk_widget_get_pointer (widget, &x, &y);
 
2526
        gdk_window_get_device_position (gtk_widget_get_window (widget),
 
2527
                                        gdk_device_manager_get_client_pointer (
 
2528
                                                gdk_display_get_device_manager (
 
2529
                                                        gtk_widget_get_display (widget))),
 
2530
                                        &x, &y, NULL);
2525
2531
 
2526
 
        if (x < 0) {
2527
 
                x_scroll = x;
 
2532
        if (x < RUBBERBAND_SCROLL_THRESHOLD) {
 
2533
                x_scroll = x - RUBBERBAND_SCROLL_THRESHOLD;
2528
2534
                x = 0;
2529
 
        } else if (x >= allocation.width) {
2530
 
                x_scroll = x - allocation.width + 1;
 
2535
        } else if (x >= allocation.width - RUBBERBAND_SCROLL_THRESHOLD) {
 
2536
                x_scroll = x - allocation.width + RUBBERBAND_SCROLL_THRESHOLD + 1;
2531
2537
                x = allocation.width - 1;
2532
2538
        } else {
2533
2539
                x_scroll = 0;
2534
2540
        }
2535
2541
 
2536
 
        if (y < 0) {
2537
 
                y_scroll = y;
 
2542
        if (y < RUBBERBAND_SCROLL_THRESHOLD) {
 
2543
                y_scroll = y - RUBBERBAND_SCROLL_THRESHOLD;
2538
2544
                y = 0;
2539
 
        } else if (y >= allocation.height) {
2540
 
                y_scroll = y - allocation.height + 1;
 
2545
        } else if (y >= allocation.height - RUBBERBAND_SCROLL_THRESHOLD) {
 
2546
                y_scroll = y - allocation.height + RUBBERBAND_SCROLL_THRESHOLD + 1;
2541
2547
                y = allocation.height - 1;
2542
2548
        } else {
2543
2549
                y_scroll = 0;
2693
2699
 
2694
2700
        /* Destroy this canvas item; the parent will unref it. */
2695
2701
        eel_canvas_item_ungrab (band_info->selection_rectangle, time);
 
2702
        eel_canvas_item_lower_to_bottom (band_info->selection_rectangle);
2696
2703
        nautilus_selection_canvas_item_fade_out (NAUTILUS_SELECTION_CANVAS_ITEM (band_info->selection_rectangle), 150);
2697
2704
        band_info->selection_rectangle = NULL;
2698
2705