Mercurial > mplayer.hg

comparison gui/ui/actions.c @ 35805:5d163370a554

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Restructure code for video window in uiChangeSkin(). Compact the conditions. It's much clearer now what's happening. Additionally, change comment to indicate that the video window will not be reloaded (like all other windows).
author ib
date Sat, 26 Jan 2013 15:32:37 +0000
parents 25852c740093
children ea15d7aebf13
comparison
equal deleted inserted replaced
35804:25852c740093 35805:5d163370a554
608 uiMainInit(); 608 uiMainInit();
609 609
610 wsWindowVisibility(&guiApp.mainWindow, wsShowWindow); 610 wsWindowVisibility(&guiApp.mainWindow, wsShowWindow);
611 mainVisible = True; 611 mainVisible = True;
612 612
613 /* reload video window (must be second!) */ 613 /* adjust video window */
614 614
615 if (guiApp.video.Bitmap.Image) 615 if (guiApp.video.Bitmap.Image) {
616 wsImageResize(&guiApp.videoWindow, guiApp.video.Bitmap.Width, guiApp.video.Bitmap.Height); 616 wsImageResize(&guiApp.videoWindow, guiApp.video.Bitmap.Width, guiApp.video.Bitmap.Height);
617 617 wsImageRender(&guiApp.videoWindow, guiApp.video.Bitmap.Image);
618 if (!guiApp.videoWindow.isFullScreen && !guiInfo.Playing) { 618 }
619
620 if (!guiInfo.Playing) {
621 if (!guiApp.videoWindow.isFullScreen) {
619 wsWindowResize(&guiApp.videoWindow, guiApp.video.width, guiApp.video.height); 622 wsWindowResize(&guiApp.videoWindow, guiApp.video.width, guiApp.video.height);
620 wsWindowMove(&guiApp.videoWindow, False, guiApp.video.x, guiApp.video.y); 623 wsWindowMove(&guiApp.videoWindow, False, guiApp.video.x, guiApp.video.y);
621 } 624 }
622 625
623 if (guiApp.video.Bitmap.Image)
624 wsImageRender(&guiApp.videoWindow, guiApp.video.Bitmap.Image);
625
626 if (!guiInfo.Playing)
627 wsWindowRedraw(&guiApp.videoWindow); 626 wsWindowRedraw(&guiApp.videoWindow);
627 }
628 628
629 /* reload playbar */ 629 /* reload playbar */
630 630
631 if (was_playbar) 631 if (was_playbar)
632 uiPlaybarDone(); 632 uiPlaybarDone();