comparison src/img-view.c @ 479:5212d4fed37f

Ensure Properties dialog is displayed above fullscreen window. Add a parameter to info_window_new() to pass parent window and revert patch 472.
author zas_
date Tue, 22 Apr 2008 08:16:02 +0000
parents 48c8e49b571c
children 67a612985686
comparison
equal deleted inserted replaced
478:9e54275835fb 479:5212d4fed37f
417 break; 417 break;
418 case 'D': case 'd': 418 case 'D': case 'd':
419 file_util_delete(image_get_fd(imd), NULL, imd->widget); 419 file_util_delete(image_get_fd(imd), NULL, imd->widget);
420 break; 420 break;
421 case 'P': case 'p': 421 case 'P': case 'p':
422 info_window_new(image_get_fd(imd), NULL); 422 info_window_new(image_get_fd(imd), NULL, vw->fs ? vw->fs->window : NULL);
423 break; 423 break;
424 case 'W': case 'w': 424 case 'W': case 'w':
425 view_window_close(vw); 425 view_window_close(vw);
426 break; 426 break;
427 default: 427 default:
1112 static void view_info_cb(GtkWidget *widget, gpointer data) 1112 static void view_info_cb(GtkWidget *widget, gpointer data)
1113 { 1113 {
1114 ViewWindow *vw = data; 1114 ViewWindow *vw = data;
1115 ImageWindow *imd; 1115 ImageWindow *imd;
1116 1116
1117 if (vw->fs) view_fullscreen_toggle(vw, FALSE);
1118
1119 imd = view_window_active_image(vw); 1117 imd = view_window_active_image(vw);
1120 info_window_new(image_get_fd(imd), NULL); 1118 info_window_new(image_get_fd(imd), NULL, vw->fs ? vw->fs->window : NULL);
1121 } 1119 }
1122 1120
1123 static void view_wallpaper_cb(GtkWidget *widget, gpointer data) 1121 static void view_wallpaper_cb(GtkWidget *widget, gpointer data)
1124 { 1122 {
1125 ViewWindow *vw = data; 1123 ViewWindow *vw = data;