mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-28 16:01:20 +02:00
- strech most windows to full screen
* switchable with existing switch for 'big_windows' * 'big_windows' default is on Conflicts: src/gui/bedit/bouqueteditor_bouquets.cpp src/gui/bedit/bouqueteditor_channels.cpp src/gui/bedit/bouqueteditor_chanselect.cpp
This commit is contained in:
@@ -45,7 +45,6 @@
|
||||
#include <zapit/zapit.h>
|
||||
#include <zapit/getservices.h>
|
||||
|
||||
|
||||
extern CBouquetManager *g_bouquetManager;
|
||||
|
||||
CBEChannelSelectWidget::CBEChannelSelectWidget(const std::string & Caption, unsigned int Bouquet, CZapitClient::channelsMode Mode)
|
||||
@@ -168,15 +167,16 @@ void CBEChannelSelectWidget::onOkKeyPressed()
|
||||
|
||||
int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & actionKey)
|
||||
{
|
||||
int fw = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth();
|
||||
width = w_max ((frameBuffer->getScreenWidth() / 20 * (fw+6)), 100);
|
||||
height = h_max ((frameBuffer->getScreenHeight() / 20 * 17), (frameBuffer->getScreenHeight() / 20 * 2));
|
||||
width = frameBuffer->getScreenWidthRel();
|
||||
height = frameBuffer->getScreenHeightRel();
|
||||
listmaxshow = (height-theight-footerHeight-0)/iheight;
|
||||
height = theight+footerHeight+listmaxshow*iheight; // recalc height
|
||||
info_height = 2*iheight + 10;
|
||||
|
||||
x = frameBuffer->getScreenX() + (frameBuffer->getScreenWidth() - width) / 2;
|
||||
y = frameBuffer->getScreenY() + (frameBuffer->getScreenHeight() - (height + info_height)) / 2;
|
||||
x = getScreenStartX(width);
|
||||
if (x < ConnectLineBox_Width)
|
||||
x = ConnectLineBox_Width;
|
||||
y = getScreenStartY(height + info_height);
|
||||
|
||||
bouquetChannels = mode == CZapitClient::MODE_TV ? &(g_bouquetManager->Bouquets[bouquet]->tvChannels) : &(g_bouquetManager->Bouquets[bouquet]->radioChannels);
|
||||
|
||||
@@ -227,8 +227,6 @@ void CBEChannelSelectWidget::paintDetails(int index)
|
||||
|
||||
void CBEChannelSelectWidget::paintItem2DetailsLine (int pos, int /*ch_index*/)
|
||||
{
|
||||
#define ConnectLineBox_Width 16
|
||||
|
||||
int xpos = x - ConnectLineBox_Width;
|
||||
int ypos1 = y + theight+0 + pos*fheight;
|
||||
int ypos2 = y + height + INFO_BOX_Y_OFFSET;
|
||||
|
Reference in New Issue
Block a user