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 'master' into pu/mp

Browse Source 
Origin commit data
------------------
Commit: 020f044c07
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-08 (Mon, 08 May 2017)
This commit is contained in:
Jacek Jendrzej
2017-05-08 12:57:22 +02:00
parent 70509251fe 01e06fa98e
commit 79ea801225
6 changed files with 112 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/widget/navibar.cpp
View File

@@ -31,8 +31,8 @@
using namespace std;
CNaviBar::CNaviBar( const int& x,
const int& y,
CNaviBar::CNaviBar( const int& x_pos,
const int& y_pos,
const int& dx,
const int& dy,
CComponentsForm* parent,
@@ -40,7 +40,7 @@ CNaviBar::CNaviBar( const int& x,
fb_pixel_t& color_frame,
fb_pixel_t& color_body,
fb_pixel_t& color_shadow)
: CComponentsFrmChain( x, y, dx, dy,
: CComponentsFrmChain( x_pos, y_pos, dx, dy,
NULL,
CC_DIR_X,
parent,

8
src/gui/widget/navibar.h
View File

@@ -53,9 +53,9 @@ class CNaviBar : public CComponentsFrmChain
public:
/**CNaviBar Constructor
* @param[in] x
* @param[in] x_pos
* @li expects type int, x position
* @param[in] y
* @param[in] y_ypos
* @li expects type int, y position
* @param[in] dx
* @li expects type int, width
@@ -74,8 +74,8 @@ class CNaviBar : public CComponentsFrmChain
*
* @see class CComponentsFrmChain()
*/
CNaviBar( const int& x,
const int& y,
CNaviBar( const int& x_pos,
const int& y_pos,
const int& dx,
const int& dy,
CComponentsForm* parent = NULL,