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

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

Browse Source 
Conflicts:
	src/neutrino.cpp
	src/system/settings.h


Origin commit data
------------------
Commit: 25f1346ad7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
This commit is contained in:
vanhofen
2017-02-09 20:22:37 +01:00
parent b6b6eb26bc e994f66c6f
commit 4d15c4d61b
12 changed files with 255 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/fb_generic.h
View File

@@ -113,7 +113,7 @@ class CFrameBuffer : public sigc::trackable
std::string backgroundFilename;
bool useBackgroundPaint;
unsigned int xRes, yRes, stride, bpp;
t_fb_var_screeninfo screeninfo, oldscreen;
t_fb_var_screeninfo screeninfo;
fb_cmap cmap;
__u16 red[256], green[256], blue[256], trans[256];
@@ -214,7 +214,7 @@ class CFrameBuffer : public sigc::trackable
inline void paintBox(int xa, int ya, int xb, int yb, const fb_pixel_t col, int radius, int type) { paintBoxRel(xa, ya, xb - xa, yb - ya, col, radius, type); }
void paintBoxFrame(const int x, const int y, const int dx, const int dy, const int px, const fb_pixel_t col, int radius = 0, int type = CORNER_ALL);
void paintLine(int xa, int ya, int xb, int yb, const fb_pixel_t col);
virtual void paintLine(int xa, int ya, int xb, int yb, const fb_pixel_t col);
inline void paintVLine(int x, int ya, int yb, const fb_pixel_t col) { paintVLineRel(x, ya, yb - ya, col); }
virtual void paintVLineRel(int x, int y, int dy, const fb_pixel_t col);