From 3a51713e8dda90bd63e39d8b82088f9ee694c3e5 Mon Sep 17 00:00:00 2001
From: Yuri Gorshenin <y@maps.me>
Date: Wed, 29 Mar 2017 15:23:58 +0300
Subject: [PATCH] Review fixes.

---
 search/search_quality/assessment_tool/context.cpp     | 2 --
 search/search_quality/assessment_tool/context.hpp     | 5 ++++-
 search/search_quality/assessment_tool/main_model.cpp  | 7 -------
 search/search_quality/assessment_tool/main_model.hpp  | 2 --
 search/search_quality/assessment_tool/result_view.cpp | 2 +-
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/search/search_quality/assessment_tool/context.cpp b/search/search_quality/assessment_tool/context.cpp
index c5999a93f5..835cbbaf1f 100644
--- a/search/search_quality/assessment_tool/context.cpp
+++ b/search/search_quality/assessment_tool/context.cpp
@@ -1,7 +1,5 @@
 #include "search/search_quality/assessment_tool/context.hpp"
 
-#include "base/string_utils.hpp"
-
 // Context -----------------------------------------------------------------------------------------
 void Context::Clear()
 {
diff --git a/search/search_quality/assessment_tool/context.hpp b/search/search_quality/assessment_tool/context.hpp
index dbd7f86b8a..3ea199cbe1 100644
--- a/search/search_quality/assessment_tool/context.hpp
+++ b/search/search_quality/assessment_tool/context.hpp
@@ -4,8 +4,11 @@
 #include "search/search_quality/assessment_tool/edits.hpp"
 #include "search/search_quality/sample.hpp"
 
+#include "base/string_utils.hpp"
+
 #include <cstddef>
 #include <functional>
+#include <string>
 #include <vector>
 
 struct Context
@@ -32,7 +35,7 @@ public:
 
     bool IsValid() const { return m_contexts != nullptr; }
 
-    string GetLabel(size_t index) const
+    std::string GetLabel(size_t index) const
     {
       return strings::ToUtf8((*m_contexts)[index].m_sample.m_query);
     }
diff --git a/search/search_quality/assessment_tool/main_model.cpp b/search/search_quality/assessment_tool/main_model.cpp
index 7359e5558f..3b46364959 100644
--- a/search/search_quality/assessment_tool/main_model.cpp
+++ b/search/search_quality/assessment_tool/main_model.cpp
@@ -15,7 +15,6 @@
 
 #include "base/assert.hpp"
 #include "base/logging.hpp"
-#include "base/scope_guard.hpp"
 
 #include <algorithm>
 #include <fstream>
@@ -55,8 +54,6 @@ void MainModel::Open(std::string const & path)
 
   ResetSearch();
 
-  MY_SCOPE_GUARD(cleanup, [this]() { m_loading = false; });
-  m_loading = true;
   m_contexts.Resize(samples.size());
   for (size_t i = 0; i < samples.size(); ++i)
   {
@@ -133,10 +130,6 @@ void MainModel::OnSampleSelected(int index)
 
 void MainModel::OnUpdate(size_t index)
 {
-  // Skip update signals during loading.
-  if (m_loading)
-    return;
-
   CHECK_LESS(index, m_contexts.Size(), ());
   auto & context = m_contexts[index];
   m_view->OnSampleChanged(index, context.HasChanges());
diff --git a/search/search_quality/assessment_tool/main_model.hpp b/search/search_quality/assessment_tool/main_model.hpp
index 6a6452d57b..27d7944395 100644
--- a/search/search_quality/assessment_tool/main_model.hpp
+++ b/search/search_quality/assessment_tool/main_model.hpp
@@ -41,8 +41,6 @@ private:
   Index const & m_index;
   ContextList m_contexts;
 
-  bool m_loading = false;
-
   std::weak_ptr<search::ProcessorHandle> m_queryHandle;
   uint64_t m_queryTimestamp = 0;
   size_t m_numShownResults = 0;
diff --git a/search/search_quality/assessment_tool/result_view.cpp b/search/search_quality/assessment_tool/result_view.cpp
index 7c3638abbc..faeb8e3da1 100644
--- a/search/search_quality/assessment_tool/result_view.cpp
+++ b/search/search_quality/assessment_tool/result_view.cpp
@@ -126,7 +126,7 @@ void ResultView::OnRelevanceChanged()
 
   bool changed = m_editor->Set(relevance);
   if (changed)
-    setStyleSheet("#result {background: rgb(255, 255, 200, 50%)}");
+    setStyleSheet("#result {background: rgba(255, 255, 200, 50%)}");
   else
     setStyleSheet("");
 }