mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

pictureviewer: fix logic,picture can be bigger than display

Browse Source
This commit is contained in:
Jacek Jendrzej
2020-02-02 14:13:12 +01:00
parent 97381484ce
commit f6bdc07f84
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/driver/pictureviewer/pictureviewer.cpp
View File

@@ -321,10 +321,15 @@ void CPictureViewer::Zoom (float factor)
if (m_CurrentPic_Buffer == oldBuf) { if (m_CurrentPic_Buffer == oldBuf) {
// resize failed // resize failed
m_CurrentPic_X = oldx;
m_CurrentPic_Y = oldy;
hideBusy (); hideBusy ();
return; return;
} }
int xs = CFrameBuffer::getInstance()->getScreenWidth(true);
int ys = CFrameBuffer::getInstance()->getScreenHeight(true);
if (m_CurrentPic_X < (m_endx - m_startx)) if (m_CurrentPic_X < (m_endx - m_startx))
m_CurrentPic_XPos = (m_endx - m_startx - m_CurrentPic_X) / 2 + m_startx; m_CurrentPic_XPos = (m_endx - m_startx - m_CurrentPic_X) / 2 + m_startx;
else else
@@ -333,11 +338,11 @@ void CPictureViewer::Zoom (float factor)
m_CurrentPic_YPos = (m_endy - m_starty - m_CurrentPic_Y) / 2 + m_starty; m_CurrentPic_YPos = (m_endy - m_starty - m_CurrentPic_Y) / 2 + m_starty;
else else
m_CurrentPic_YPos = m_starty; m_CurrentPic_YPos = m_starty;
if (m_CurrentPic_X > (m_endx - m_startx)) if ((m_endx - m_startx) > xs)
m_CurrentPic_XPan = (m_CurrentPic_X - (m_endx - m_startx)) / 2; m_CurrentPic_XPan = (m_CurrentPic_X - (m_endx - m_startx)) / 2;
else else
m_CurrentPic_XPan = 0; m_CurrentPic_XPan = 0;
if (m_CurrentPic_Y > (m_endy - m_starty)) if ((m_endy - m_starty) > ys)
m_CurrentPic_YPan = (m_CurrentPic_Y - (m_endy - m_starty)) / 2; m_CurrentPic_YPan = (m_CurrentPic_Y - (m_endy - m_starty)) / 2;
else else
m_CurrentPic_YPan = 0; m_CurrentPic_YPan = 0;