mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

CComponentsShapeSircle: fix segfault on init

Browse Source
This commit is contained in:
Thilo Graf
2012-09-01 23:35:17 +02:00
parent 2126bbda81
commit 4b1d9ca213
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/components/cc.h
View File

@@ -389,4 +389,16 @@ class CComponentsTitleBar : public CComponentsItemBox
}; };
class CComponentsForm : public CComponentsContainer
{
private:
public:
CComponentsForm();
void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
};
#endif #endif

19
src/gui/components/components.cpp
View File

@@ -455,8 +455,7 @@ CComponentsShapeCircle::CComponentsShapeCircle( int x_pos, int y_pos, int diam,
//CComponents //CComponents
x = x_pos; x = x_pos;
y = y_pos; y = y_pos;
width = d; //width = height = d = diam;
height = d;
shadow = has_shadow; shadow = has_shadow;
shadow_w = SHADOW_OFFSET; shadow_w = SHADOW_OFFSET;
col_frame = color_frame; col_frame = color_frame;
@@ -467,7 +466,7 @@ CComponentsShapeCircle::CComponentsShapeCircle( int x_pos, int y_pos, int diam,
bgMode = CC_BGMODE_PERMANENT; bgMode = CC_BGMODE_PERMANENT;
//CComponentsShapeCircle //CComponentsShapeCircle
d = diam; width = height = d = diam;
//CComponentsContainer //CComponentsContainer
corner_rad = d/2; corner_rad = d/2;
@@ -1314,3 +1313,17 @@ void CComponentsTitleBar::paint(bool do_save_bg)
paintItemBox(do_save_bg); paintItemBox(do_save_bg);
} }
//-------------------------------------------------------------------------------------------------------
//sub class CComponentsForm from CComponentsItemBox
CComponentsForm::CComponentsForm()
{
//CComponentsContainer
initVarContainer();
}
void CComponentsForm::paint(bool do_save_bg)
{
paintInit(do_save_bg);
}