From 4dc9830eccfa573972e779cdc9773cd8a62fadae Mon Sep 17 00:00:00 2001 From: Pierric Gimmig Date: Wed, 20 Sep 2023 07:06:55 -0700 Subject: [PATCH 1/4] Fix drawing of incomplete intervals (#4842) Incomplete intervals, drawn as orange translucid rectangles, could be drawn over the track headers on the left side of the capture view. Make sure we clamp the x coordinate. Tested by introducing fake intervals and making sure they aligned properly on the timeline and that they did not draw over the track headers. --- src/OrbitGl/TrackContainer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/OrbitGl/TrackContainer.cpp b/src/OrbitGl/TrackContainer.cpp index 3ac511c22e4..e4f421fc5d9 100644 --- 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; From c4197bed539289265b8e19be232293be09db64d3 Mon Sep 17 00:00:00 2001 From: Pierric Gimmig Date: Wed, 20 Sep 2023 07:07:38 -0700 Subject: [PATCH 2/4] Revert time range selection (#4843) --- src/ClientFlags/ClientFlags.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ClientFlags/ClientFlags.cpp b/src/ClientFlags/ClientFlags.cpp index 135ffc05822..a454c87f966 100644 --- 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."); From f047972e5da8b797806e8e7119ea5b6f37c11ec3 Mon Sep 17 00:00:00 2001 From: Pierric Gimmig Date: Wed, 4 Oct 2023 23:11:01 -0700 Subject: [PATCH 3/4] Trigger build when conanfile.py changes (#4849) --- .github/workflows/build-and-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 057a803e083..35da0ac7dca 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -13,6 +13,7 @@ on: - 'cmake/**' - 'src/**' - 'third_party/**' + - 'conanfile.*' pull_request: branches: - 'main' From 088d4b8c130f773ac8850e416bab22978ac75f17 Mon Sep 17 00:00:00 2001 From: Pierric Gimmig Date: Thu, 5 Oct 2023 00:48:24 -0700 Subject: [PATCH 4/4] Change order of conan dependency to fix Windows build (#4851) --- .github/workflows/build-and-test.yml | 2 +- conanfile.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 35da0ac7dca..43023787369 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -13,7 +13,7 @@ on: - 'cmake/**' - 'src/**' - 'third_party/**' - - 'conanfile.*' + - 'conanfile.py' pull_request: branches: - 'main' diff --git a/conanfile.py b/conanfile.py index 95da4204e13..8535b815fb2 100644 --- 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):