Merge branch 'google:main' into build-improvements

google · Oct 5, 2023 · 554d20c · 554d20c
2 parents 4e8a45d + 088d4b8
commit 554d20c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -13,6 +13,7 @@ on:
       - 'cmake/**'
       - 'src/**'
       - 'third_party/**'
+      - 'conanfile.py'
   pull_request:
     branches:
       - 'main'

diff --git a/conanfile.py b/conanfile.py
@@ -49,8 +49,8 @@ def config_options(self):
 
     def build_requirements(self):
         if self.options.with_system_deps: return
-        self.build_requires('protobuf/3.21.4')
         self.build_requires('grpc/1.48.0')
+        self.build_requires('protobuf/3.21.4')
         self.build_requires('gtest/1.11.0', force_host_context=True)
 
     def requirements(self):

diff --git a/src/ClientFlags/ClientFlags.cpp b/src/ClientFlags/ClientFlags.cpp
@@ -62,7 +62,7 @@ ABSL_FLAG(
 
 ABSL_FLAG(bool, auto_frame_track, true, "Automatically add the default Frame Track.");
 
-ABSL_FLAG(bool, time_range_selection, true, "Enable time range selection feature.");
+ABSL_FLAG(bool, time_range_selection, false, "Enable time range selection feature.");
 
 ABSL_FLAG(bool, symbol_store_support, false, "Enable experimental symbol store support.");
 

diff --git a/src/OrbitGl/TrackContainer.cpp b/src/OrbitGl/TrackContainer.cpp
@@ -322,7 +322,8 @@ void TrackContainer::DrawIncompleteDataIntervals(PrimitiveAssembler& primitive_a
   const float world_height = viewport_->GetWorldHeight();
 
   // Actually draw the ranges.
-  for (const auto& [start_x, end_x] : x_ranges) {
+  for (auto [start_x, end_x] : x_ranges) {
+    start_x = std::max(layout_->GetTrackHeaderWidth(), start_x);
     const Vec2 pos{start_x, world_start_y};
     const Vec2 size{end_x - start_x, world_height};
     float z_value = GlCanvas::kZValueIncompleteDataOverlay;