diff --git a/escher/src/scroll_view.cpp b/escher/src/scroll_view.cpp index cdacbd6ba..925382a93 100644 --- a/escher/src/scroll_view.cpp +++ b/escher/src/scroll_view.cpp @@ -31,7 +31,11 @@ void ScrollView::layoutSubviews() { // TODO // Layout contentview // FIXME: Use KDCoordinateMax - m_contentView->setFrame({m_offset.x, m_offset.y, (KDCoordinate)9999, (KDCoordinate)9999}); + KDRect frame; + frame.origin = m_offset; + frame.width = KDCoordinateMax; + frame.height = KDCoordinateMax; + m_contentView->setFrame(frame); } #if ESCHER_VIEW_LOGGING diff --git a/escher/src/tab_view.cpp b/escher/src/tab_view.cpp index d35fe0b7c..614407b21 100644 --- a/escher/src/tab_view.cpp +++ b/escher/src/tab_view.cpp @@ -43,12 +43,12 @@ void TabView::layoutSubviews() { // Simple layout: all tabs have the same length KDCoordinate tabLength = bounds().width/m_numberOfTabs; for (int i=0; ibounds().width, - tabHeight - }); + + KDRect tabViewFrame; + tabViewFrame.origin = KDPointZero; + tabViewFrame.width = this->bounds().width, + tabViewFrame.height = tabHeight; + m_tabView.setFrame(tabViewFrame); if (m_activeView) { - m_activeView->setFrame({ - 0, - tabHeight, - this->bounds().width, - (KDCoordinate)(this->bounds().height - tabHeight) - }); + KDRect activeViewFrame; + activeViewFrame.x = 0; + activeViewFrame.y = tabHeight; + activeViewFrame.width = this->bounds().width; + activeViewFrame.height = (this->bounds().height - tabHeight); + m_activeView->setFrame(activeViewFrame); } }