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

Merge branch 'cst-next' into nmp-cst-next

Browse Source 
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-08-19 17:40:48 +02:00
parent 3daad4c6d5 59d3c49084
commit 2c4ccf9555
260 changed files with 8682 additions and 4001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/driver/fb_window.cpp
View File

@@ -69,6 +69,11 @@ void CFBWindow::paintBoxRel(const int _x, const int _y, const int _dx, const int
frameBuffer->paintBoxRel(x + _x, y + _y, _dx, _dy, _col, radius, type);
}
void CFBWindow::paintBoxFrame(int _x, int _y, int _dx, int _dy, int _px, const color_t _col, int radius, int type)
{
frameBuffer->paintBoxFrame(x + _x, y + _y, _dx, _dy, _px, _col, radius, type);
}
void CFBWindow::paintVLineRel(int _x, int _y, int _dy, const color_t _col)
{
frameBuffer->paintVLineRel(x + _x, y + _y, _dy, _col);