Commit Graph

51 Commits

Author SHA1 Message Date
Stefan Seyfried
ca332cefa8 CTextBox: fix text position calculation
Origin commit data
------------------
Commit: a85878db2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-01 (Sun, 01 Feb 2015)
2015-02-09 13:47:31 +01:00
Michael Liebmann
ac834e963b CTextBox: Fix center / right text display
- The x position of the text could assume negative values,
 when the text length was greater than the specified range.


Origin commit data
------------------
Commit: a6487fd951
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)

Origin message was:
------------------
CTextBox: Fix center / right text display

- The x position of the text could assume negative values,
 when the text length was greater than the specified range.
2014-10-16 17:14:04 +02:00
Thilo Graf
fec91793d8 CTextBox: fix return value of getMaxLineWidth()
m_nMaxLineWidth was never used


Origin commit data
------------------
Commit: f902c7a1e3
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-08-03 (Sun, 03 Aug 2014)
2014-08-26 17:26:55 +04:00
Michael Liebmann
7135b7649d CTextBox: Add Flag m_renderMode (Font::FULLBG) for RenderString()
Origin commit data
------------------
Commit: 1b9037e8e8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-06-27 (Fri, 27 Jun 2014)
2014-06-29 13:25:32 +02:00
vanhofen
98c0a441d8 change RenderString() default to UTF8
Origin commit data
------------------
Commit: 649d1b1f9d
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change RenderString() default to UTF8
2014-06-11 23:07:13 +02:00
vanhofen
3bba3094e2 change getRenderWidth() default to UTF8
Origin commit data
------------------
Commit: 8b91cda918
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change getRenderWidth() default to UTF8
2014-06-11 23:07:00 +02:00
Thilo Graf
a610226223 CTextBox: reinit text variables after evaluated comparison
Origin commit data
------------------
Commit: e617bab6cf
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-01 (Fri, 01 Nov 2013)
2013-11-11 00:19:45 +01:00
Thilo Graf
c59a486f11 CTextBox: add new parameter to setText() force_repaint
Paint routine of text has changed, so it can be useful to affect the old
behavior of text repaint beacause of text is painted only if
text or some other properties have changed.
Default value of force_repaint is true, so we have the same behavior like
before changes.


Origin commit data
------------------
Commit: 7e91fecc02
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-31 (Thu, 31 Oct 2013)
2013-11-11 00:19:45 +01:00
Thilo Graf
81a24f8717 CTextBox: fix repaint of background of textbox on scroll and changed text
suplement to c3ecec9612


Origin commit data
------------------
Commit: 5c7e926a86
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-27 (Sun, 27 Oct 2013)
2013-10-27 14:53:59 +01:00
Michael Liebmann
c3ecec9612 CTextBox: Fix background paint
Origin commit data
------------------
Commit: ca22cb9241
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-26 (Sat, 26 Oct 2013)
2013-10-26 18:55:40 +02:00
Michael Liebmann
1e6c8d4420 CTextBox: Add function getLinesPerPage()
- Add AUTO_LINEBREAK_NO_BREAKCHARS to textbox_modes for
 auto linebreak without '-' and '.' char


Origin commit data
------------------
Commit: 3d404afc7f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-18 (Fri, 18 Oct 2013)

Origin message was:
------------------
CTextBox: Add function getLinesPerPage()

- Add AUTO_LINEBREAK_NO_BREAKCHARS to textbox_modes for
 auto linebreak without '-' and '.' char
2013-10-24 21:19:06 +02:00
Thilo Graf
be503ea748 CTextBox: ensure paint of text and background only if required
It's not new, but this involves also other properties,
like color or position...

It's possible that more properties are required, maybe needs to be watched
and evaluation of comparison might require further revisions.


Origin commit data
------------------
Commit: adba310c1c
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
2013-10-24 21:19:06 +02:00
Thilo Graf
0dfb948ffa CTextBox: ensure restore of background, if pixbuf exists
This may prevent undefined behavior or even possible segfaults


Origin commit data
------------------
Commit: 302649eca4
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-20 (Sun, 20 Oct 2013)
2013-10-20 02:54:46 +02:00
Thilo Graf
b7ea3c3f76 CTextBox: ensure paint of background to avoid overlapped letters
Origin commit data
------------------
Commit: 08e23a917c
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-16 (Mon, 16 Sep 2013)
2013-09-19 08:24:40 +02:00
Thilo Graf
a64d514c4b CTextBox: set the correct H/V border
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: b7b74ec718
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-07-22 (Mon, 22 Jul 2013)
2013-07-22 14:14:36 +02:00
Michael Liebmann
7b6498d39f Replace color indexes of the text colors by real color values for RenderString()
- If necessary, Correct data types of the color values


Origin commit data
------------------
Commit: c60c5c5ce3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-11 (Thu, 11 Jul 2013)
2013-07-21 22:00:58 +02:00
FlatTV
43a759358d CTextBox: expand parameters of member setTextBorderWidth()
This allows to use different horizontal and vertical width of borders
in text boxes.

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


Origin commit data
------------------
Commit: 153d2f3c78
Author: FlatTV <FlatTV@gmx.de>
Date: 2013-07-01 (Mon, 01 Jul 2013)
2013-07-07 14:24:02 +02:00
Michael Liebmann
09355f643a CTextBox: Remove workaround for minimally text_border_width
- Default value is now 1 in CComponentsText


Origin commit data
------------------
Commit: ba1e514747
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)
2013-06-12 01:32:24 +02:00
FlatTV
6b933134f1 CComponentsText: add possibility to set a text border
Origin commit data
------------------
Commit: 96da2f95b8
Author: FlatTV <FlatTV@gmx.de>
Date: 2013-06-06 (Thu, 06 Jun 2013)

Origin message was:
------------------
- CComponentsText: add possibility to set a text border
2013-06-06 22:08:46 +02:00
vanhofen
02b25f13d5 textbox: don't accept boxes with no borderwidth
Origin commit data
------------------
Commit: 050df14f8d
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-08 (Wed, 08 May 2013)

Origin message was:
------------------
- textbox: don't accept boxes with no borderwidth
2013-05-08 00:30:58 +02:00
Michael Liebmann
8ed53286e8 CTextBox: rename setFontTextHeight() => getFontTextHeight()
Origin commit data
------------------
Commit: 2c740f1db8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-01 (Wed, 01 May 2013)

Origin message was:
------------------
* CTextBox: rename setFontTextHeight() => getFontTextHeight()
2013-05-04 21:42:10 +02:00
Michael Liebmann
b8a04490f4 CTextBox: When using only digits to display:
- Use for calculating digit height
 font->getDigitHeight() / font->getDigitOffset()


Origin commit data
------------------
Commit: fccb07cfc9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-24 (Wed, 24 Apr 2013)

Origin message was:
------------------
* CTextBox: When using only digits to display:

- Use for calculating digit height
 font->getDigitHeight() / font->getDigitOffset()
2013-04-28 16:48:09 +02:00
Michael Liebmann
89fd7346b3 CTextBox::scrollPageUp/Down: Suppress refresh when there is nothing to scroll
Origin commit data
------------------
Commit: c74fb77603
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-03-20 (Wed, 20 Mar 2013)

Origin message was:
------------------
* CTextBox::scrollPageUp/Down: Suppress refresh when there is nothing to scroll
2013-03-21 06:56:23 +01:00
Thilo Graf
f49d09b904 CTextBox: don't hide if m_nPaintBackground is set to false
Required in CCompmonentsText. Hide of textbox object is unnecessary in
CCompmonentsText objects.


Origin commit data
------------------
Commit: 4db5c450a4
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-11-09 (Fri, 09 Nov 2012)
2013-03-06 11:28:10 +01:00
Michael Liebmann
0d8f3b2549 CTextBox: Fix displayed text width in function setText()
Origin commit data
------------------
Commit: 11b2242d2e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-11-08 (Thu, 08 Nov 2012)

Origin message was:
------------------
* CTextBox: Fix displayed text width in function setText()
2012-11-08 22:37:37 +01:00
Thilo Graf
5345b55a58 CTextBox: remove dub allocation of m_pcFontText
Origin commit data
------------------
Commit: 08e66deb75
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-11-07 (Wed, 07 Nov 2012)
2012-11-08 22:37:18 +01:00
Thilo Graf
8549bf695d CTextBox: remove dub var
revert of c25af575bf


Origin commit data
------------------
Commit: 94a49e3a51
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-11-05 (Mon, 05 Nov 2012)
2012-11-05 22:04:42 +01:00
Thilo Graf
c25af575bf CTextBox: fix build
merge error, max_width is not declared


Origin commit data
------------------
Commit: 6016c60b4c
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-11-05 (Mon, 05 Nov 2012)
2012-11-05 21:26:22 +01:00
Thilo Graf
f1ef3effce CTextBox: modified AUTO_WIDTH, add some printfs and comments
If is set m_nMaxWidth, then use this to calculate m_cFrameTextRel.iWidth.
To set m_nMaxWidth use setWindowMaxDimensions(width) and setText(maxwidth).
This should help, to paint text with clean linebreaks
into defined textboxes.


Origin commit data
------------------
Commit: 474a35a254
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-10-26 (Fri, 26 Oct 2012)
2012-11-05 21:26:22 +01:00
Thilo Graf
813249a861 CTextBox: add option BOTTOM
BOTTOM was missed


Origin commit data
------------------
Commit: fee315f642
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-24 (Mon, 24 Sep 2012)

Origin message was:
------------------
*CTextBox: add option BOTTOM

BOTTOM was missed
2012-11-05 21:26:22 +01:00
Thilo Graf
def1c260ab CTextBox: add optional text align TOP
Origin commit data
------------------
Commit: 33e684bc20
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-22 (Sat, 22 Sep 2012)

Origin message was:
------------------
*CTextBox: add optional text align TOP
2012-11-05 21:26:21 +01:00
Thilo Graf
9dfacfc01b CTextbox: add text align option RIGHT
This supports paint of text on the right side of frame and
also considers scroll bar width.


Origin commit data
------------------
Commit: c25edc0b74
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-22 (Sat, 22 Sep 2012)

Origin message was:
------------------
*CTextbox: add text align option RIGHT

This supports paint of text on the right side of frame and
also considers scroll bar width.
2012-11-05 21:26:21 +01:00
Thilo Graf
466164e876 CTextBox: set text y position depends of lines count
If we have only one line, text will be painted horizontal centered,
otherwise text begins on top of frame.


Origin commit data
------------------
Commit: c9472dc3f3
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-22 (Sat, 22 Sep 2012)

Origin message was:
------------------
*CTextBox: set text y position depends of lines count

If we have only one line, text will be painted horizontal centered,
otherwise text begins on top of frame.
2012-11-05 21:26:21 +01:00
Thilo Graf
5384692aec CTextbox: add members setWindowMaxDimensions, setWindowMinDimensions
so we can control max an mnin width and height


Origin commit data
------------------
Commit: 130d7bf6c2
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-22 (Sat, 22 Sep 2012)
2012-11-05 21:26:21 +01:00
Thilo Graf
656ac34059 CTextBox: fix freezes in channellist and bedit
refreshTextLineArray() was to much in reSizeMainFrameHeight() and
initFramesRel(), caused endless loops under certain circumstances


Origin commit data
------------------
Commit: 1244af4666
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-20 (Thu, 20 Sep 2012)

Origin message was:
------------------
*CTextBox: fix freezes in channellist and bedit

refreshTextLineArray() was to much in reSizeMainFrameHeight() and
initFramesRel(), caused endless loops under certain circumstances
2012-11-05 21:26:21 +01:00
Thilo Graf
f6b393fe03 CTextBox: trivial change for better readability in initVar()
Origin commit data
------------------
Commit: a7bdf41dfe
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-19 (Wed, 19 Sep 2012)

Origin message was:
------------------
*CTextBox: trivial change for better readability in initVar()
2012-11-05 21:26:20 +01:00
Thilo Graf
b556c305a5 CTextBox: add member initFramesAndTextArray(), move max_width into initVar
this combines initFramesRel() and	refreshTextLineArray()


Origin commit data
------------------
Commit: ed3be21ebd
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-19 (Wed, 19 Sep 2012)

Origin message was:
------------------
*CTextBox: add member initFramesAndTextArray(), move max_width into initVar

this combines initFramesRel() and	refreshTextLineArray()
2012-11-05 21:26:20 +01:00
Thilo Graf
ab9dccaa75 CTextBox: style, reworked statements for better readability
Origin commit data
------------------
Commit: 57cb8cc3e0
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-19 (Wed, 19 Sep 2012)

Origin message was:
------------------
*CTextBox: style, reworked statements for better readability
2012-11-05 21:26:20 +01:00
Thilo Graf
8cbe889f50 CTextBox: remove frameBuffer = NULL
already happens in initVar()


Origin commit data
------------------
Commit: ad72c62471
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-19 (Wed, 19 Sep 2012)

Origin message was:
------------------
*CTextBox: remove frameBuffer = NULL

already happens in initVar()
2012-11-05 21:26:20 +01:00
Thilo Graf
3008ec98bc CTextBox: add missed init of lineBreakWidth
lineBreakWidth is not initialized, but some othe values also not defined,
here is seems somthing wrong


Origin commit data
------------------
Commit: d7dc44146c
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-18 (Tue, 18 Sep 2012)

Origin message was:
------------------
*CTextBox: add missed init of lineBreakWidth

lineBreakWidth is not initialized, but some othe values also not defined,
here is seems somthing wrong
2012-11-05 21:26:20 +01:00
Thilo Graf
062ec23f6c CTextBox: move framebuffer define only into initVar
framebuffer = NULL was called in all constructors,
so it should be enough to define this only at one point.


Origin commit data
------------------
Commit: 55896356f1
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-11-05 (Mon, 05 Nov 2012)

Origin message was:
------------------
*CTextBox: move framebuffer define only into initVar

framebuffer = NULL was called in all constructors,
so it should be enough to define this only at one point.
2012-11-05 21:26:20 +01:00
Thilo Graf
1e537fe322 CTextBox: some small style clean ups for better readability
Origin commit data
------------------
Commit: 323393548d
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-16 (Sun, 16 Sep 2012)

Origin message was:
------------------
*CTextBox: some small style clean ups for better readability
2012-11-05 21:26:19 +01:00
Thilo Graf
c4dbf75417 CTextBox: remove printf
it' makes osd too slow


Origin commit data
------------------
Commit: 69c22d1594
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-27 (Mon, 27 Aug 2012)

Origin message was:
------------------
*CTextBox: remove printf

it' makes osd too slow
2012-11-05 21:26:18 +01:00
Jacek Jendrzej
d74377dd47 initialize not initialized var
Origin commit data
------------------
Commit: 926e0ce141
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-05 (Mon, 05 Nov 2012)

Origin message was:
------------------
initialize not initialized var
2012-11-05 09:24:51 +01:00
Thilo Graf
ed6438b87d CTextbox: Required functions for CCompoments
- Add member to disable background box
- Add setter for text an background color
- Add setTextBorderWidth() & setTextFont()
- Calculate y-position of text in refreshText()


Origin commit data
------------------
Commit: 39306221b1
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-16 (Thu, 16 Aug 2012)

Origin message was:
------------------
*CTextbox: Required functions for CCompoments

- Add member to disable background box
- Add setter for text an background color
- Add setTextBorderWidth() & setTextFont()
- Calculate y-position of text in refreshText()
2012-08-21 09:48:22 +01:00
Thilo Graf
0c31abbf1e includes: add global.h
Origin commit data
------------------
Commit: d1f22aa20c
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-15 (Wed, 15 Aug 2012)

Origin message was:
------------------
*includes: add global.h
2012-08-21 09:48:22 +01:00
[CST] Focus
a2be692de6 gui/widget/textbox.cpp: fix string access outside of its size
Origin commit data
------------------
Commit: b014b965f4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-10 (Thu, 10 May 2012)
2012-05-10 12:18:11 +04:00
Michael Liebmann
13bcebcd19 Prevents division by zero.
- In particular text box dimensions was a division by zero.


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1831 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: b4186edcb8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2011-11-06 (Sun, 06 Nov 2011)
2011-11-05 23:32:53 +00:00
Jacek Jendrzej
9819856e7d change 'long long' tom int64_t'; change variable buf to new delete;
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@291 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 8f59cc96ec
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-02-07 (Sun, 07 Feb 2010)
2010-02-07 14:32:21 +00:00
mws
e19aef671b fix shadow stuff and initializers....
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@118 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 6e718d8987
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-23 (Wed, 23 Dec 2009)
2009-12-23 12:08:43 +00:00