mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-26 23:13:13 +02:00
fix after pick: fb_accel_arm
Conflicts: src/driver/fb_accel.h src/driver/fb_accel_arm.cpp src/gui/channellist.cpp Signed-off-by: Thilo Graf <dbt@novatux.de> This can be only a hack with limited effect to fix render errors in channel list window. . There must be another solution.
This commit is contained in:
@@ -225,7 +225,7 @@ class CFbAccelARM
|
|||||||
int scale2Res(int size);
|
int scale2Res(int size);
|
||||||
bool fullHdAvailable();
|
bool fullHdAvailable();
|
||||||
void setOsdResolutions();
|
void setOsdResolutions();
|
||||||
#if BOXMODEL_HD51
|
#if BOXMODEL_BRE2ZE4K || BOXMODEL_HD51 || BOXMODEL_H7
|
||||||
void paintRect(const int x, const int y, const int dx, const int dy, const fb_pixel_t col);
|
void paintRect(const int x, const int y, const int dx, const int dy, const fb_pixel_t col);
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
@@ -56,7 +56,7 @@ static bool supportblendingflags = true;
|
|||||||
static int fb_fd = -1;
|
static int fb_fd = -1;
|
||||||
static int exec_list(void);
|
static int exec_list(void);
|
||||||
|
|
||||||
#if BOXMODEL_HD51
|
#if BOXMODEL_BRE2ZE4K || BOXMODEL_HD51 || BOXMODEL_H7
|
||||||
static bool accumulateoperations = false;
|
static bool accumulateoperations = false;
|
||||||
|
|
||||||
bool bcm_accel_has_alphablending()
|
bool bcm_accel_has_alphablending()
|
||||||
@@ -390,7 +390,7 @@ bool CFbAccelARM::fullHdAvailable()
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if BOXMODEL_HD51
|
#if BOXMODEL_BRE2ZE4K || BOXMODEL_HD51 || BOXMODEL_H7
|
||||||
void CFbAccelARM::paintRect(const int x, const int y, const int dx, const int dy, const fb_pixel_t col)
|
void CFbAccelARM::paintRect(const int x, const int y, const int dx, const int dy, const fb_pixel_t col)
|
||||||
{
|
{
|
||||||
if(dx <1 || dy <1 )
|
if(dx <1 || dy <1 )
|
||||||
|
@@ -2535,6 +2535,10 @@ void CChannelList::paint_events(CChannelEventList &evtlist)
|
|||||||
ffheight = g_Font[eventFont]->getHeight();
|
ffheight = g_Font[eventFont]->getHeight();
|
||||||
frameBuffer->paintBoxRel(x+ width,y+ theight+pig_height, infozone_width, infozone_height,COL_MENUCONTENT_PLUS_0);
|
frameBuffer->paintBoxRel(x+ width,y+ theight+pig_height, infozone_width, infozone_height,COL_MENUCONTENT_PLUS_0);
|
||||||
|
|
||||||
|
#if BOXMODEL_BRE2ZE4K || BOXMODEL_HD51 || BOXMODEL_H7
|
||||||
|
usleep(300);
|
||||||
|
#endif
|
||||||
|
|
||||||
char startTime[10];
|
char startTime[10];
|
||||||
int eventStartTimeWidth = 4 * g_Font[eventFont]->getMaxDigitWidth() + g_Font[eventFont]->getRenderWidth(":") + OFFSET_INNER_SMALL; // use a fixed value
|
int eventStartTimeWidth = 4 * g_Font[eventFont]->getMaxDigitWidth() + g_Font[eventFont]->getRenderWidth(":") + OFFSET_INNER_SMALL; // use a fixed value
|
||||||
int startTimeWidth = 0;
|
int startTimeWidth = 0;
|
||||||
|
Reference in New Issue
Block a user