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' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Commit: a19fc5532b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-22 (Tue, 22 Nov 2016)
This commit is contained in:
vanhofen
2016-11-22 23:45:32 +01:00
parent 940432f3aa 3949bfb5f7
commit eae5c01db1
15 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/components/cc_frm_clock.cpp
View File

@@ -190,8 +190,8 @@ void CComponentsFrmClock::initCCLockItems()
//background paint of item is not required
lbl->doPaintBg(false);
//set corner properties of label item
lbl->setCorner(corner_rad-fr_thickness, corner_type);
//preset corner properties of label item
lbl->setCorner(max(0, corner_rad-fr_thickness), corner_type);
//set text border to 0
lbl->setTextBorderWidth(0,0);
@@ -234,7 +234,7 @@ void CComponentsFrmClock::initCCLockItems()
else if (i == v_cc_items.size()-1)
lbl->setCornerType(corner_type & CORNER_RIGHT);// last label item
else
lbl->setCornerType(0);// inner items
lbl->setCorner(0,CORNER_NONE);// inner items don't need round corners
}
//extract timestring segment (char)

2
src/gui/components/cc_item_infobox.h
View File

@@ -83,6 +83,8 @@ class CComponentsInfoBox : public CComponentsText
void setPicture(const std::string& picture_name);
///set property: path or name of displayed image, parameter as const char*
void setPicture(const char* picture_name);
///retur internal picture object
CComponentsPicture * getPictureObject(){return pic;}
///paint item
void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
};