Mercurial > geeqie.yaz

comparison src/layout_image.c @ 621:734b6b0a3356

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
image_osd_get() now returns OsdShowFlags.
author zas_
date Sat, 10 May 2008 14:22:18 +0000
parents b2898f04c82e
children 8268cbe682f1
comparison
equal deleted inserted replaced
620:f335373f44e5 621:734b6b0a3356
356 #if 0 356 #if 0
357 gtk_widget_set_sensitive(lw->window, FALSE); 357 gtk_widget_set_sensitive(lw->window, FALSE);
358 if (lw->tools) gtk_widget_set_sensitive(lw->tools, FALSE); 358 if (lw->tools) gtk_widget_set_sensitive(lw->tools, FALSE);
359 #endif 359 #endif
360 360
361 if (image_osd_get(lw->full_screen->normal_imd, NULL)) 361 if (image_osd_get(lw->full_screen->normal_imd) & OSD_SHOW_INFO)
362 { 362 {
363 image_osd_set(lw->image, OSD_SHOW_INFO | OSD_SHOW_STATUS); 363 image_osd_set(lw->image, image_osd_get(lw->full_screen->normal_imd));
364 image_osd_set(lw->full_screen->normal_imd, OSD_SHOW_NOTHING); 364 image_osd_set(lw->full_screen->normal_imd, OSD_SHOW_NOTHING);
365 } 365 }
366 } 366 }
367 367
368 void layout_image_full_screen_stop(LayoutWindow *lw) 368 void layout_image_full_screen_stop(LayoutWindow *lw)
369 { 369 {
370 if (!layout_valid(&lw)) return; 370 if (!layout_valid(&lw)) return;
371 if (!lw->full_screen) return; 371 if (!lw->full_screen) return;
372 372
373 if (image_osd_get(lw->image, NULL)) 373 if (image_osd_get(lw->full_screen->normal_imd) & OSD_SHOW_INFO)
374 { 374 image_osd_set(lw->full_screen->normal_imd, image_osd_get(lw->image));
375 image_osd_set(lw->full_screen->normal_imd, OSD_SHOW_STATUS); 375
376 }
377 fullscreen_stop(lw->full_screen); 376 fullscreen_stop(lw->full_screen);
378 377
379 #if 0 378 #if 0
380 gtk_widget_set_sensitive(lw->window, TRUE); 379 gtk_widget_set_sensitive(lw->window, TRUE);
381 if (lw->tools) gtk_widget_set_sensitive(lw->tools, TRUE); 380 if (lw->tools) gtk_widget_set_sensitive(lw->tools, TRUE);