diff options
| author | Jay Taoko <jay.taoko@canonical.com> | 2011-03-23 22:55:22 -0400 |
|---|---|---|
| committer | Jay Taoko <jay.taoko@canonical.com> | 2011-03-23 22:55:22 -0400 |
| commit | 0fc880d7a3e4abba7630924f43e1ca5434ae5a33 (patch) | |
| tree | f03920b548f0da0dbf6eb06a7aaf0a9b4ec1bdca | |
| parent | dc05150b257d3604fc8fcbc34ac1a3e8108f70af (diff) | |
| parent | 6cb7bbcf1df2deb765c16c7903d303690f37a327 (diff) | |
* Fixed scrollbar clipping in Dash
(bzr r1019)
| -rw-r--r-- | src/PlacesVScrollBar.cpp | 13 | ||||
| -rw-r--r-- | src/PlacesVScrollBar.h | 3 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/PlacesVScrollBar.cpp b/src/PlacesVScrollBar.cpp index c07d8c414..01354db0d 100644 --- a/src/PlacesVScrollBar.cpp +++ b/src/PlacesVScrollBar.cpp @@ -142,11 +142,18 @@ PlacesVScrollBar::RecvMouseDrag (int x, void PlacesVScrollBar::PreLayoutManagement () { - UpdateTexture (); - nux::VScrollBar::PreLayoutManagement (); } +long +PlacesVScrollBar::PostLayoutManagement (long LayoutResult) +{ + long ret = nux::VScrollBar::PostLayoutManagement (LayoutResult); + + UpdateTexture (); + return ret; +} + void PlacesVScrollBar::Draw (nux::GraphicsEngine &gfxContext, bool force_draw) { @@ -163,7 +170,7 @@ PlacesVScrollBar::Draw (nux::GraphicsEngine &gfxContext, bool force_draw) return; //texxform.SetWrap (nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT); - texxform.SetTexCoordType (nux::TexCoordXForm::OFFSET_COORD); + texxform.SetTexCoordType (nux::TexCoordXForm::OFFSET_SCALE_COORD); gfxContext.GetRenderStates ().SetBlend (true); gfxContext.GetRenderStates ().SetPremultipliedBlend (nux::SRC_OVER); diff --git a/src/PlacesVScrollBar.h b/src/PlacesVScrollBar.h index c881999c8..41a778c27 100644 --- a/src/PlacesVScrollBar.h +++ b/src/PlacesVScrollBar.h @@ -69,7 +69,8 @@ class PlacesVScrollBar : public nux::VScrollBar unsigned long key_flags); protected: - void PreLayoutManagement (); + virtual void PreLayoutManagement (); + virtual long PostLayoutManagement (long LayoutResult); void Draw (nux::GraphicsEngine& gfxContext, bool forceDraw); |
