classes cleaning

This commit is contained in:
unK
2008-09-05 10:17:47 +02:00
parent db996a3e86
commit c997e13091
9 changed files with 122 additions and 195 deletions

View File

@@ -68,7 +68,7 @@ void Scrollpad::Add(string str)
if (!collect && !tmp.empty())
{
if (is_valid_color(TO_STRING(tmp)))
if (IsValidColor(TO_STRING(tmp)))
itsXPos -= tmp.length();
tmp.clear();
}
@@ -99,10 +99,10 @@ void Scrollpad::Add(string str)
}
}
itsContent += TO_STRING(s);
recreate_win();
Recreate();
}
void Scrollpad::recreate_win()
void Scrollpad::Recreate()
{
delwin(itsWindow);
itsWindow = newpad(itsRealHeight, itsWidth);
@@ -111,12 +111,6 @@ void Scrollpad::recreate_win()
Write(itsContent.c_str());
}
void Scrollpad::Display(bool stub)
{
Window::show_border();
Refresh(stub);
}
void Scrollpad::Refresh(bool stub)
{
prefresh(itsWindow,itsBeginning,0,itsStartY,itsStartX,itsStartY+itsHeight-1,itsStartX+itsWidth);
@@ -148,18 +142,13 @@ void Scrollpad::Resize(int width, int height)
string tmp = itsRawContent;
itsRawContent.clear();
Add(tmp);
recreate_win();
Recreate();
}
}
void Scrollpad::Go(Where where)
{
int MaxBeginning;
if (itsContent.size() < itsHeight)
MaxBeginning = 0;
else
MaxBeginning = itsRealHeight-itsHeight;
int MaxBeginning = itsContent.size() < itsHeight ? 0 : itsRealHeight-itsHeight;
switch (where)
{
@@ -198,20 +187,6 @@ void Scrollpad::Go(Where where)
}
}
void Scrollpad::SetBorder(Border border)
{
if (have_to_recreate(border))
recreate_win();
itsBorder = border;
}
void Scrollpad::SetTitle(string newtitle)
{
if (have_to_recreate(newtitle))
recreate_win();
itsTitle = newtitle;
}
void Scrollpad::Clear(bool clear_screen)
{
itsBeginning = 0;
@@ -227,7 +202,7 @@ void Scrollpad::Clear(bool clear_screen)
Window::Clear();
}
Window * Scrollpad::EmptyClone()
Window * Scrollpad::EmptyClone() const
{
return new Scrollpad(GetStartX(),GetStartY(),GetWidth(),GetHeight(),itsTitle,itsBaseColor,itsBorder);
}