mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

CTextBox: fix freezes in channellist and bedit

Browse Source 
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
This commit is contained in:
Thilo Graf
2012-09-20 09:37:15 +02:00
parent 61c9429840
commit 656ac34059
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/widget/textbox.cpp
View File

@@ -228,8 +228,7 @@ void CTextBox::reSizeMainFrameWidth(int textWidth)
m_cFrame.iWidth = iNewWindowWidth; m_cFrame.iWidth = iNewWindowWidth;
/* Re-Init the children frames due to new main window */ /* Re-Init the children frames due to new main window */
//Initialise the window frames first and than refresh text line array initFramesRel();
initFramesAndTextArray();
} }
void CTextBox::reSizeMainFrameHeight(int textHeight) void CTextBox::reSizeMainFrameHeight(int textHeight)
@@ -247,8 +246,7 @@ void CTextBox::reSizeMainFrameHeight(int textHeight)
m_cFrame.iHeight = iNewWindowHeight; m_cFrame.iHeight = iNewWindowHeight;
/* Re-Init the children frames due to new main window */ /* Re-Init the children frames due to new main window */
//Initialise the window frames first and than refresh text line array initFramesRel();
initFramesAndTextArray();
} }
void CTextBox::initFramesRel(void) void CTextBox::initFramesRel(void)
@@ -571,8 +569,8 @@ bool CTextBox::setText(const std::string* newText, int _max_width)
m_cText = *newText; m_cText = *newText;
//m_cText = *newText + "\n"; //FIXME test //m_cText = *newText + "\n"; //FIXME test
reSizeMainFrameHeight(m_cFrame.iHeight); reSizeMainFrameHeight(m_cFrame.iHeight);
//Initialise the window frames first and than refresh text line array //refresh text line array
initFramesAndTextArray(); refreshTextLineArray();
refresh(); refresh();
result = true; result = true;
} }