← Back to branch summary

~ubuntu-branches/ubuntu/vivid/nip2/vivid-proposed

« back to all changes in this revision

Viewing changes to src/imagepresent.c

  • Committer: Bazaar Package Importer
  • Author(s): Jay Berkenbilt
  • Date: 2010-10-18 20:33:55 UTC
  • mfrom: (2.2.4 experimental) (2.1.11 sid)
  • Revision ID: james.westby@ubuntu.com-20101018203355-z2zmf7klex8n74fl
http://bugs.debian.org/600550
Add abrowser as an additional choice to satisfy the browser
dependency.  This removes differences between the Debian and Ubuntu
versions of the package.  (Closes: #600550)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/imagepresent.c
449
449
        gboolean frozen, RegionviewType type, RegionviewResize resize,
450
450
        int x, int y )
451
451
{
 
452
        g_assert( !ip->regionview );
 
453
 
452
454
        ip->floating.left = left;
453
455
        ip->floating.top = top;
454
456
        ip->floating.width = width;
801
803
        IMAGE *im, *im2;
802
804
        int ix, iy;
803
805
 
 
806
        /* If there's a regionview grabbed already, block other actions. This
 
807
         * can happen with, for example, the win32 backend where we don't
 
808
         * always see a RELEASE for every PRESS.
 
809
         */
 
810
        if( ip->regionview )
 
811
                return( FALSE );
 
812
 
804
813
        switch( imagemodel->state ) {
805
814
        case IMAGEMODEL_SELECT:
806
 
                if( !ip->regionview && ev->button.state & GDK_CONTROL_MASK ) {
 
815
                if( ev->button.state & GDK_CONTROL_MASK ) {
807
816
                        im = imageinfo_get( FALSE, conv->ii );
808
817
 
809
818
                        imagepresent_snap_point( ip, x, y, &x, &y );
1015
1024
 
1016
1025
        imagemodel_paint_recalc( imagemodel );
1017
1026
        imageinfo_undo_mark( imageinfo );
 
1027
 
 
1028
        /* Ask everyone to drop cache, the image has changed.
 
1029
         */
 
1030
        im_invalidate( imageinfo_get( FALSE, imageinfo ) );
1018
1031
}
1019
1032
 
1020
1033
/* Left button release event.
1166
1179
                        imagemodel->ink, imagemodel->nib, 
1167
1180
                        ip->paint_last_x, ip->paint_last_y, ix, iy ) )
1168
1181
                        iwindow_alert( GTK_WIDGET( ip ), GTK_MESSAGE_ERROR );
 
1182
                im_invalidate( imageinfo_get( FALSE, imageinfo ) );
 
1183
 
1169
1184
                ip->paint_last_x = ix;
1170
1185
                ip->paint_last_y = iy;
1171
1186
                break;
1191
1206
                        ip->paint_last_x, ip->paint_last_y, 
1192
1207
                        ix, iy ) )
1193
1208
                        iwindow_alert( GTK_WIDGET( ip ), GTK_MESSAGE_ERROR );
 
1209
                im_invalidate( imageinfo_get( FALSE, imageinfo ) );
 
1210
 
1194
1211
                ip->paint_last_x = ix;
1195
1212
                ip->paint_last_y = iy;
 
1213
 
1196
1214
                break;
1197
1215
 
1198
1216
        default:
1199
1217
                break;
1200
1218
        }
 
1219
 
1201
1220
}
1202
1221
 
1203
1222
/* Main event loop.