diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-03 17:08:41 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-03 17:08:41 (GMT) |
| commit | 9260b2c3e8740afae051761067f9afe05c6cdb04 (patch) | |
| tree | 58ebe239a320c3927fb0a1e0465f480259661ae7 /src/preview/PreviewView.cpp | |
| parent | 11d2b0eb3cfa6ff57fd6585c19b4dadd39cd7abb (diff) | |
| download | powder-9260b2c3e8740afae051761067f9afe05c6cdb04.zip powder-9260b2c3e8740afae051761067f9afe05c6cdb04.tar.gz | |
Move rect border drawing for previewview to draw over fav+report buttons, fix issue #64
Diffstat (limited to 'src/preview/PreviewView.cpp')
| -rw-r--r-- | src/preview/PreviewView.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/preview/PreviewView.cpp b/src/preview/PreviewView.cpp index ba081be..f6c74b4 100644 --- a/src/preview/PreviewView.cpp +++ b/src/preview/PreviewView.cpp @@ -196,13 +196,6 @@ void PreviewView::DoDraw() { Window::DoDraw(); Graphics * g = ui::Engine::Ref().g; - if(c->GetDoOpen()) - { - g->fillrect(Position.X+(Size.X/2)-101, Position.Y+(Size.Y/2)-26, 202, 52, 0, 0, 0, 210); - g->drawrect(Position.X+(Size.X/2)-100, Position.Y+(Size.Y/2)-25, 200, 50, 255, 255, 255, 180); - g->drawtext(Position.X+(Size.X/2)-(Graphics::textwidth("Loading save...")/2), Position.Y+(Size.Y/2)-5, "Loading save...", style::Colour::InformationTitle.Red, style::Colour::InformationTitle.Green, style::Colour::InformationTitle.Blue, 255); - } - for(int i = 0; i < commentTextComponents.size(); i++) { int linePos = commentTextComponents[i]->Position.Y+commentsPanel->ViewportPosition.Y+commentTextComponents[i]->Size.Y+4; @@ -214,6 +207,14 @@ void PreviewView::DoDraw() Position.Y+linePos, 255, 255, 255, 100); } + if(c->GetDoOpen()) + { + g->fillrect(Position.X+(Size.X/2)-101, Position.Y+(Size.Y/2)-26, 202, 52, 0, 0, 0, 210); + g->drawrect(Position.X+(Size.X/2)-100, Position.Y+(Size.Y/2)-25, 200, 50, 255, 255, 255, 180); + g->drawtext(Position.X+(Size.X/2)-(Graphics::textwidth("Loading save...")/2), Position.Y+(Size.Y/2)-5, "Loading save...", style::Colour::InformationTitle.Red, style::Colour::InformationTitle.Green, style::Colour::InformationTitle.Blue, 255); + } + g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255); + } void PreviewView::OnDraw() @@ -222,7 +223,6 @@ void PreviewView::OnDraw() //Window Background+Outline g->clearrect(Position.X-2, Position.Y-2, Size.X+4, Size.Y+4); - g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255); //Save preview (top-left) if(savePreview && savePreview->Data) |