From e7aaad2c16e89d7571675fc9f83a0f5f64bdf65b Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 17 Jun 2018 16:41:07 +0000
Subject: [PATCH] CtrlLib: ScrollBar style: bgcolor

git-svn-id: svn://ultimatepp.org/upp/trunk@11998 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlLib/ScrollBar.cpp    | 3 ++-
 uppsrc/CtrlLib/ScrollBar.h      | 1 +
 uppsrc/VirtualGui/ChSysInit.cpp | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/uppsrc/CtrlLib/ScrollBar.cpp b/uppsrc/CtrlLib/ScrollBar.cpp
index 64eee5b31..9a430fd33 100644
--- a/uppsrc/CtrlLib/ScrollBar.cpp
+++ b/uppsrc/CtrlLib/ScrollBar.cpp
@@ -33,6 +33,7 @@ CH_STYLE(ScrollBar, Style, StyleDefault)
 	Sb(right2, CtrlsImg::RA());
 	isup2 = isdown2 = isleft2 = isright2 = false;
 	thumbwidth = Null;
+	bgcolor = SColorPaper();
 }
 
 ScrollBar::ScrollBar() {
@@ -135,7 +136,7 @@ Rect ScrollBar::GetPartRect(int p) const {
 }
 
 void ScrollBar::Paint(Draw& w) {
-	w.DrawRect(GetSize(), SColorPaper());
+	w.DrawRect(GetSize(), style->bgcolor);
 	int cc;
 	Size sz = style->through ? GetSize() : Slider(cc).GetSize();
 	light = GetMousePart();
diff --git a/uppsrc/CtrlLib/ScrollBar.h b/uppsrc/CtrlLib/ScrollBar.h
index dec403f12..4b707b792 100644
--- a/uppsrc/CtrlLib/ScrollBar.h
+++ b/uppsrc/CtrlLib/ScrollBar.h
@@ -17,6 +17,7 @@ public:
 
 public:
 	struct Style : ChStyle<Style> {
+		Color bgcolor;
 		int barsize, arrowsize, thumbmin, overthumb, thumbwidth;
 		bool through;
 		Value vupper[4], vthumb[4], vlower[4];
diff --git a/uppsrc/VirtualGui/ChSysInit.cpp b/uppsrc/VirtualGui/ChSysInit.cpp
index 841b6c753..d6566f219 100644
--- a/uppsrc/VirtualGui/ChSysInit.cpp
+++ b/uppsrc/VirtualGui/ChSysInit.cpp
@@ -6,8 +6,6 @@ NAMESPACE_UPP
 
 void ChSysInit()
 {
-	CtrlImg::Reset();
-	CtrlsImg::Reset();
 	ChReset();
 }