From bbcd6c2017762f9a0e6cf0ac6466bbf78f593b14 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 19 四月 2021 09:36:40 +0800
Subject: [PATCH] Merge branch 'wxr4' into temp-wxr
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
index c9291ea..372e38b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
@@ -68,6 +68,7 @@
{
bodyView = this;
function = func;
+ lightTemp = new Light();
}
public void LoadPage(Button btnCollectionIcon, Button btnFunctionNameOut, Button btnFromFloorOut)
@@ -162,6 +163,12 @@
{
colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
}
+ colorPicker.MouseDownEventHandler = (sender, e) => {
+ MainPage.BasePageView.ScrollEnabled = false;
+ };
+ colorPicker.MouseUpEventHandler = (sender, e) => {
+ MainPage.BasePageView.ScrollEnabled = true;
+ };
//鐧界偣鎺т欢
this.btnWhiteRound = new Button();
--
Gitblit v1.8.0