From cbd35c0321529a33d05748f157e5be8a29757c13 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 17 七月 2019 12:56:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into equipstar
---
System/OpenServerActivity/OpenServerActivityWin.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerActivityWin.cs b/System/OpenServerActivity/OpenServerActivityWin.cs
index fb7ea98..80b103e 100644
--- a/System/OpenServerActivity/OpenServerActivityWin.cs
+++ b/System/OpenServerActivity/OpenServerActivityWin.cs
@@ -263,7 +263,7 @@
private void SecondEvent()
{
- var cell = m_ActivityCtrl.GetActiveCellView(12);
+ var cell = m_ActivityCtrl.GetActiveCellView(12, ScrollerDataType.Header);
if (cell != null)
{
var activityCell = cell as OpenServerActivityCell;
@@ -444,10 +444,10 @@
}
foreach (var _type in impactRankModel.impactRankSorts)
{
- if (impactRankModel.IsLock(_type))
- {
- continue;
- }
+ //if (impactRankModel.IsLock(_type))
+ //{
+ // continue;
+ //}
m_ActivityCtrl.AddCell(ScrollerDataType.Normal, activityId * 100 + _type);
}
break;
--
Gitblit v1.8.0