mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/driver/fb_generic.h


Origin commit data
------------------
Commit: 3ff64707df
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
This commit is contained in:
vanhofen
2017-02-15 21:52:59 +01:00
parent 1a0368da1e b37a04311e
commit 298fdbfe36
18 changed files with 502 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/components/cc_item_picture.cpp
View File

@@ -33,7 +33,6 @@
#include "cc_item_picture.h"
#include <unistd.h>
#include <system/debug.h>
#include <system/helpers.h>
#include <driver/pictureviewer/pictureviewer.h>
extern CPictureViewer * g_PicViewer;
@@ -222,10 +221,9 @@ void CComponentsPicture::initCCItem()
{
float h_ratio = float(height)*100/(float)dy;
width = int(h_ratio*(float)dx/100);
#ifdef BOXMODEL_CS_HD2
if (do_scale && (width > 10 || height > 10))
width = GetWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness;
#endif
if (frameBuffer->needAlign4Blit() &&
do_scale && (width > 10 || height > 10))
width = frameBuffer->getWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness;
keep_dx_aspect = false;
}
if (keep_dy_aspect && dx)