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

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-09-26 12:52:04 +02:00
parent 8dad062eff ca09c92542
commit b7ceb705a0
52 changed files with 1130 additions and 892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/components/Makefile.am
View File

@@ -11,6 +11,7 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/lib/xmltree \
@SIGC_CFLAGS@ \
@FREETYPE_CFLAGS@ \
@LUA_CFLAGS@ \
@HWLIB_CFLAGS@
noinst_LIBRARIES = libneutrino_gui_components.a

11
src/gui/components/cc_detailsline.cpp
View File

@@ -53,12 +53,14 @@ void CComponentsDetailsLine::initVarDline( const int& x_pos, const int& y_pos_to
col_shadow = color_shadow;
col_body = color_line;
shadow_w = 1;
//CComponentsDetailsLine
y_down = y_pos_down;
h_mark_top = h_mark_top_;
h_mark_down = h_mark_down_;
shadow_w = 1;
// reduce two times the shadow width, to avoid shadow overlaps
h_mark_top = h_mark_top_ - 2*shadow_w;
h_mark_down = h_mark_down_ - 2*shadow_w;
//CComponentsDetailsLine
dl_w = CFrameBuffer::getInstance()->scale2Res(3);
@@ -96,9 +98,6 @@ void CComponentsDetailsLine::paint(bool do_save_bg)
int sw = shadow_w;
// reduce two times the shadow width, to avoid shadow overlaps
h_mark_down -= 2*sw;
int y_mark_top = y-h_mark_top/2;
int y_mark_down = y_down-h_mark_down/2;
int dx_c = dl_w%2; //correction for odd values

4
src/gui/components/cc_detailsline.h
View File

@@ -67,9 +67,9 @@ class CComponentsDetailsLine : public CComponents
///set property: lowest y position
void setYPosDown(const int& y_pos_down){y_down = y_pos_down;};
///set property: height of top marker
void setHMarkTop(const int& h_mark_top_){h_mark_top = h_mark_top_;};
void setHMarkTop(const int& h_mark_top_){h_mark_top = h_mark_top_ - 2*shadow_w;};
///property: height of bottom marker
void setHMarkDown(const int& h_mark_down_){h_mark_down = h_mark_down_;};
void setHMarkDown(const int& h_mark_down_){h_mark_down = h_mark_down_ - 2*shadow_w;};
///set all positions and dimensions of details line at once
void setDimensionsAll(const int& x_pos,const int& y_pos, const int& y_pos_down, const int& h_mark_top_ , const int& h_mark_down_)
{setXPos(x_pos); setYPos(y_pos); setYPosDown(y_pos_down); setHMarkTop(h_mark_top_); setHMarkDown(h_mark_down_);}