From d74d8d9aa0b08b3b8460f0871f89579f006c657b Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 11 Feb 2019 21:49:09 +0100 Subject: [PATCH] listframe.cpp: fix overlapping header line on scrollbar Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/c606b963ba0157ffe973d243dcc8384df7aa63a2 Author: Thilo Graf Date: 2019-02-11 (Mon, 11 Feb 2019) --- src/gui/widget/listframe.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/widget/listframe.cpp b/src/gui/widget/listframe.cpp index 163dd28b5..d50a760bc 100644 --- a/src/gui/widget/listframe.cpp +++ b/src/gui/widget/listframe.cpp @@ -270,9 +270,9 @@ void CListFrame::initFramesRel(void) if(m_nMode & SCROLL) { m_cFrameScrollRel.iX = m_cFrame.iWidth - SCROLLBAR_WIDTH; - m_cFrameScrollRel.iY = m_cFrameTitleRel.iHeight; + m_cFrameScrollRel.iY = m_cFrameTitleRel.iHeight + m_cFrameHeaderListRel.iHeight; m_cFrameScrollRel.iWidth = SCROLLBAR_WIDTH; - m_cFrameScrollRel.iHeight = m_cFrameHeaderListRel.iHeight + m_cFrameListRel.iHeight - m_nBgRadius; + m_cFrameScrollRel.iHeight = m_cFrameHeaderListRel.iHeight + m_cFrameListRel.iHeight - m_cFrameHeaderListRel.iHeight - m_nBgRadius; } else { @@ -286,7 +286,7 @@ void CListFrame::initFramesRel(void) if(m_nMode & HEADER_LINE) { - m_cFrameHeaderListRel.iWidth = m_cFrame.iWidth - m_cFrameScrollRel.iWidth; + m_cFrameHeaderListRel.iWidth = m_cFrame.iWidth; } m_nLinesPerPage = (m_cFrameListRel.iHeight - (2*OFFSET_INNER_MID)) / m_nFontListHeight; @@ -377,7 +377,7 @@ void CListFrame::refreshScroll(void) if (1) { frameBuffer->paintBoxRel(m_cFrameScrollRel.iX+m_cFrame.iX, m_cFrameScrollRel.iY+m_cFrame.iY, - m_cFrameScrollRel.iWidth, m_cFrameHeaderListRel.iHeight + m_cFrameListRel.iHeight, COL_MENUCONTENT_PLUS_0, + m_cFrameScrollRel.iWidth, m_cFrameHeaderListRel.iHeight, COL_MENUCONTENT_PLUS_0, m_nBgRadius, CORNER_BOTTOM_RIGHT); }