Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
skyjake committed Jun 11, 2013
1 parent 44299df commit b754c89
Showing 1 changed file with 0 additions and 37 deletions.
37 changes: 0 additions & 37 deletions doomsday/client/src/ui/widgets/logwidget.cpp
Expand Up @@ -321,8 +321,6 @@ public Font::RichFormat::IStyle
ColorBank::Color dimmedColor;
ColorBank::Color accentColor;
ColorBank::Color dimAccentColor;
//int margin;
//int topMargin;

// GL objects.
VertexBuf *buf;
Expand All @@ -347,8 +345,6 @@ public Font::RichFormat::IStyle
cancelRewrap(0),
visibleRange(Rangei(-1, -1)),
font(0),
//margin(0),
//topMargin(0),
buf(0),
entryAtlas(0),
entryAtlasLayoutChanged(false),
Expand Down Expand Up @@ -542,33 +538,11 @@ public Font::RichFormat::IStyle
return self.viewportSize().x;
}

/*
int contentHeight() const
{
return self.viewportSize().y;
}
*/

int maxVisibleOffset()
{
return self.maximumScrollY().valuei();
}

/*
void clampVisibleOffset(int visibleHeight)
{
setVisibleOffset(de::min(int(visibleOffset), maxVisibleOffset(visibleHeight)), 0);
}
void setVisibleOffset(int off, float span)
{
if(int(visibleOffset) != off)
{
visibleOffset.setValue(off, span);
emit self.scrollPositionChanged(off);
}
}*/

void fetchNewCachedEntries()
{
int oldHeight = self.contentHeight();
Expand Down Expand Up @@ -712,9 +686,6 @@ public Font::RichFormat::IStyle
// oldest ones if limit has been reached.
//prune();

//clampVisibleOffset(contentSize.y);
//maxScroll = maxVisibleOffset(contentSize.y);

VertexBuf::Builder verts;

for(int attempt = 0; attempt < 2; ++attempt)
Expand Down Expand Up @@ -801,14 +772,6 @@ public Font::RichFormat::IStyle

// We don't need to keep all entries ready for drawing immediately.
releaseExcessComposedEntries();

/*
// Notify now that we know what the max scroll is.
if(lastMaxScroll != maxScroll)
{
lastMaxScroll = maxScroll;
emit self.scrollMaxChanged(maxScroll);
}*/
}
};

Expand Down

0 comments on commit b754c89

Please sign in to comment.