Commit Graph

133 Commits

Author SHA1 Message Date
Thilo Graf
6141510858 CComponentsHeader: use internal offset instead OFFSET_INNER_MID
Internal offset is already defined.
2018-02-07 19:45:50 +01:00
Thilo Graf
ee04bbb368 CComponentsHeader: fix possible build error with dangling-else
error: suggest explicit braces to avoid ambiguous 'else' [-Werror=dangling-else]

see commit: 02631f14ca
2018-02-04 20:47:41 +01:00
max_10
02631f14ca fix overpaint buttons in channellist edit mode 2018-02-04 20:03:17 +01:00
Thilo Graf
26c552a1ed CComponentsHeader: avoid possible 'out of range' log message
seen during left/right scroll with channellist
2018-01-14 13:39:21 +01:00
Thilo Graf
fb5c943db4 cc: expand cc-type with name
Required for internal operations where it is useful to have object
names and for better debugging.
2017-12-30 22:58:15 +01:00
Stefan Seyfried
f6b04a297a CComponentsHeader: fix text position if icon is removed 2017-12-28 00:07:23 +01:00
Jacek Jendrzej
23797d29c0 Merge branch 'master' into pu/mp 2017-08-29 11:26:54 +02:00
Thilo Graf
5221769840 CComponentsHeader: add missing check for null pointer 2017-08-28 12:16:45 +02:00
Jacek Jendrzej
1763bb9e64 Merge branch 'master' into pu/mp 2017-08-08 20:06:40 +02:00
Thilo Graf
8e17eadb6a CComponentsHeader: disable permanent clock paint on interval. 2017-08-08 14:25:12 +02:00
Thilo Graf
356719cf3a CComponentsHeader: rework and simplified logo handling
This should fix some issues with possible overlapps
of logos with title. With some Conditions with text
alignment on the right side needs a fix.
There is an issue with size and position of text object, but is stll not
used at the moment. For all other conditions of logo and text alignments now
it should be not a problem (I hope) and have more code clarity.
2017-08-08 14:25:12 +02:00
Jacek Jendrzej
2ddad19873 Merge branch 'master' into pu/mp 2017-06-21 13:54:49 +02:00
svenhoefer
980e293517 - cc_frm_header: remove CComponentsHeaderLocalized() subclass
use another constructor of CComponentsHeader() instead

Signed-off-by: Thilo Graf <dbt@novatux.de>

Good idea, this I had already in mind too.
2017-06-21 10:31:22 +02:00
Jacek Jendrzej
a70f3cb025 Merge branch 'master' into pu/mp 2017-06-16 14:19:26 +02:00
Thilo Graf
f46a174155 CComponentsHeader: fix corner type comparison 2017-06-16 10:10:48 +02:00
Jacek Jendrzej
05e8d727bd Merge branch 'master' into pu/mp 2017-05-28 22:30:05 +02:00
Thilo Graf
1f8007c50c CComponentsHeader: ensure reset of icon object 2017-05-27 02:51:36 +02:00
Jacek Jendrzej
152c4e3fe4 Merge branch 'master' into pu/mp 2017-05-11 16:44:05 +02:00
Thilo Graf
942a27e3ef cc_frm_header.cpp/h: remove CTextBox types for title allignment
Title object has only width of current text content. This causes CTextBox
types have not a really visible effect. Now we have only three align types for title
and these are related to cc-text object position.

Involved classes adjusted too.
2017-05-11 12:15:16 +02:00
Thilo Graf
1b2f1d320d CComponentsHeader: fix brace error
suggest explicit braces to avoid ambiguous ‘else’
2017-05-11 08:39:20 +02:00
Jacek Jendrzej
fb23ac0126 Merge branch 'master' into pu/mp
except c08144a9d9 edb0a5937e
2017-05-10 15:37:31 +02:00
Thilo Graf
5b541571f9 CComponentsHeader: Try to adopt different logo/title alignments
Not all constellations are tested. Please report.
2017-05-10 10:42:08 +02:00
Thilo Graf
178bf6f596 CComponentsHeader: fix centering of header title 2017-05-10 10:42:08 +02:00
Thilo Graf
c320dbf8ec CComponentsHeader: remove double text color assignment 2017-05-10 10:42:08 +02:00
Thilo Graf
107db09299 CComponentsHeader: fix order of width calculation
Required for following position calculation
2017-05-10 10:42:08 +02:00
Jacek Jendrzej
0b2f2afe01 Merge branch 'master' into pu/mp 2017-05-05 13:27:14 +02:00
Thilo Graf
18fb99688c CComponentsHeader: optimize logo size/position handling
Prevent oversized paint with stupid screen and/or font size settings
2017-05-03 21:29:41 +02:00
Thilo Graf
cb02d6253d Revert "-cc_form_header: add max caption width"
This reverts commit c482dd139f.
2017-05-03 21:29:41 +02:00
Jacek Jendrzej
4ae57d1567 Merge branch 'master' into pu/mp 2017-05-02 22:35:18 +02:00
TangoCash
c482dd139f -cc_form_header: add max caption width
picked from:	https://github.com/TangoCash/neutrino-mp-cst-next
commit:	4ff6c9f89b194c5fffdc4ee4e4eb744829be975f

Signed-off-by: Thilo Graf <dbt@novatux.de>
review reqiured
2017-05-02 21:07:59 +02:00
Jacek Jendrzej
d8ba9c822a Merge branch 'master' into pu/mp 2017-04-29 19:03:17 +02:00
Thilo Graf
c8326af0df CComponentsHeader: adjust context button offset 2017-04-29 18:00:03 +02:00
Jacek Jendrzej
0ef6e3fe98 Merge branch 'master' into pu/mp 2017-04-27 14:27:27 +02:00
Thilo Graf
71606d0860 CComponentsHeader: rectification for 'optimize auto size mode for logos'
see commit: 76cd93555d

Additional variable was required.
Values were overwritten and had no effect.
2017-04-27 09:27:45 +02:00
Thilo Graf
c2bc8b4f8f CComponentsHeader: fix logo position with clock
This reverts "fix logo position with clock",
commit b696007ec8.
Was not the right way.

Id's are not in visual order, therefore it's better to calculate direct
with the ''width"" properties of possible following items clock
and context buttons.
2017-04-26 12:24:21 +02:00
Jacek Jendrzej
b696007ec8 fix logo position with clock 2017-04-25 16:38:47 +02:00
Jacek Jendrzej
de7847f096 Merge branch 'master' into pu/mp 2017-04-25 13:43:33 +02:00
Thilo Graf
76cd93555d CComponentsHeader: optimize auto size mode for logos
With very large font size settings it is possible
that header is too large for reasonable display of logos, because of
possible bad upscale effects (eg. step effects).
So it seems it's better to use original size as largest possible size.
2017-04-25 11:38:30 +02:00
Thilo Graf
220829ffaa CComponentsHeader: unifiy init value for logo align 2017-04-25 11:36:49 +02:00
Jacek Jendrzej
f292ba6b69 Merge branch 'master' into pu/mp 2017-04-24 21:33:15 +02:00
Thilo Graf
330171c90b CComponentsHeader: use previous offset to fit logo
Was OFFSET_INNER_MIN in older versions, not OFFSET_INNER_SMALL.
2017-04-23 17:01:15 +02:00
Thilo Graf
1413f296ae CComponentsHeader: add fallback if title and logo are overlapping
Logo is now general centered on screen, not as before between title and clock
2017-04-23 17:01:08 +02:00
svenhoefer
0b2eb4bfb3 Merge branch 'master' into pu/mp 2017-04-22 16:13:02 +02:00
Thilo Graf
68835056c3 CComponentsHeader: add possibility to show channellogo
Contains methode setChannelLogo() with parameters
for channel id, channel name and optional
alignment (primary between title and clock). Default
alignment is centered.
Optional parameter to set logo height is available too.

Hope it works on first try. To see how it works, take look
at channellist class.
2017-04-21 22:47:23 +02:00
svenhoefer
11a28c07d6 Merge branch 'master' into pu/mp 2017-04-19 21:35:56 +02:00
Thilo Graf
cbba7b78f4 CComponentsFrmClock: remove unnecessary call of cch_cl_obj->setYPos() 2017-04-17 16:44:57 +02:00
Thilo Graf
42db55e61d CComponentsHeader: Reduce offset between clock and right border.
Was too large
2017-04-17 16:44:53 +02:00
svenhoefer
064f693bf7 Merge branch 'master' into pu/mp
Conflicts:
	src/gui/epgplus.cpp
2017-04-08 14:36:12 +02:00
Thilo Graf
3e342a7661 CComponentsHeader: add methode initRepaintSlot() and considered parent
Required in sub classes. Considering of parent ensures usage of
required background color in sub classes.
2017-04-08 08:16:01 +02:00
Stefan Seyfried
8b47699447 Merge remote-tracking branch 'tuxbox/master' 2017-02-11 11:18:45 +01:00