Merge branch 'connection-popup'

NEWS

@@ -88,6 +88,7 @@ v0.5 (xxxx-xx-xx)
 - Added frame time target lines.
 - FPS counts are now displayed next to frame times.
 - GPU drift value can be now automatically measured.
+- Connection window is now a popup hidden under a dedicated button.
 
 v0.4.1 (2018-12-30)
 -------------------

manual/tracy.tex

@@ -1171,14 +1171,17 @@ The \emph{discovered clients} list is only displayed if there are clients broadc
 
 Both connecting to a client and opening a saved trace will present you with the main profiler view, which you can use to analyze the data (see section~\ref{analyzingdata}).
 
-If this is a real-time capture, you will also see the connection window (figure~\ref{connectioninfo}), with the capture status similar to the one displayed by the command line utility. This dialog also displays the connection speed graphed over time and the profiled application's current frames per second and frame time measurements. The \emph{Query backlog} represents the number of queries that were held back due to the bandwidth volume overwhelming the available network send buffer. While this number drains down to zero, the performance of real time profiling may be temporarily compromised. The circle displayed next to the bandwidth graph signals the connection status. If it's red, the connection is active. If it's gray, the client has disconnected.
+\subsubsection{Connection information pop-up}
+\label{connectionpopup}
+
+If this is a real-time capture, you will also have access to the connection information pop-up (figure~\ref{connectioninfo}) through the \emph{\faWifi{}~Connection} button, with the capture status similar to the one displayed by the command line utility. This dialog also displays the connection speed graphed over time and the profiled application's current frames per second and frame time measurements. The \emph{Query backlog} represents the number of queries that were held back due to the bandwidth volume overwhelming the available network send buffer. While this number drains down to zero, the performance of real time profiling may be temporarily compromised. The circle displayed next to the bandwidth graph signals the connection status. If it's red, the connection is active. If it's gray, the client has disconnected.
 
 You can use the \faSave{}~\emph{Save trace} button to save the current profile data to a file\footnote{This should be taken literally. If a live capture is in progress and a save is performed, some data may be missing from the capture and won't be saved.}. Use the \faPlug{}~\emph{Stop} button to disconnect from the client\footnote{While requesting disconnect stops retrieval of any new events, the profiler will wait for any data that is still pending for the current set of events.}. The \faExclamationTriangle{}~\emph{Discard} button is used to discard current trace.
 
 \begin{figure}[h]
 \centering\begin{tikzpicture}
-\draw (0, 0) rectangle (6.1, -3.2);
+\draw (0, 0.5) rectangle (6.1, -3.2);
-\draw[pattern=crosshatch dots] (0, 0) rectangle+(6.1, 0.3);
+\draw (0, 0.5) node[anchor=north west] {Connected to: 127.0.0.1};
 \draw[pattern=north east lines] (0.35, -0.35) circle(0.2);
 \draw (0.7, -0.1) rectangle+(3.5, -0.5) node[midway] {Bandwidth graph};
 \draw (4.3, -0.1) node[anchor=north west] {1.9 Mbps};
@@ -1190,7 +1193,7 @@ You can use the \faSave{}~\emph{Save trace} button to save the current profile d
 \draw[rounded corners=5pt] (2.6, -2.6) rectangle+(1.3, -0.5) node [midway] {\faPlug{}~Stop};
 \draw[rounded corners=5pt] (4.0, -2.6) rectangle+(2, -0.5) node [midway] {\faExclamationTriangle{}~Discard};
 \end{tikzpicture}
-\caption{Connection information window.}
+\caption{Connection information pop-up.}
 \label{connectioninfo}
 \end{figure}
 
@@ -1278,6 +1281,7 @@ The main profiler window is split into three sections, as seen on figure~\ref{ma
 The control menu (top row of buttons) provides access to various features of the profiler. The buttons perform the following actions:
 
 \begin{itemize}
+\item \emph{\faWifi{}~Connection} -- Opens the connection information popup (see section~\ref{connectionpopup}). Only available when live capture is in progress.
 \item \emph{\faPowerOff{} Close} -- This button unloads the current profiling trace and returns to the welcome menu, where another trace can be loaded. In live captures it is replaced by \emph{\faPause{}~Pause}, \emph{\faPlay{}~Resume} and \emph{\faSquare{}~Stopped} buttons.
 \item \emph{\faPause{} Pause} -- While a live capture is in progress, the profiler will display the last three fully captured frames, so that you can see the current behavior of the program. Use this button\footnote{Or perform any action on the timeline view.} to stop the automatic updates of the timeline view (the capture will be still progressing).
 \item \emph{\faPlay{} Resume} -- Use this button to resume following the most recent three frames in a live capture.

server/TracyView.cpp

@@ -422,11 +422,7 @@ bool View::DrawImpl()
     bool keepOpen = true;
     bool* keepOpenPtr = nullptr;
     (void)keepOpenPtr;
-    if( !m_staticView )
+    if( m_staticView )
-    {
-        if( !DrawConnection() ) return false;
-    }
-    else
     {
         keepOpenPtr = &keepOpen;
     }
@@ -462,6 +458,27 @@ bool View::DrawImpl()
     ImGui::Begin( tmp, keepOpenPtr, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoBringToFrontOnFocus );
 #endif
 
+    if( !m_staticView )
+    {
+#if defined TRACY_EXTENDED_FONT
+        if( ImGui::Button( ICON_FA_WIFI ) )
+#else
+        if( ImGui::Button( "Connection" ) )
+#endif
+        {
+            ImGui::OpenPopup( "TracyConnectionPopup" );
+        }
+        ImGui::SameLine();
+        if( ImGui::BeginPopup( "TracyConnectionPopup" ) )
+        {
+            const bool wasDisconnectIssued = m_disconnectIssued;
+            const bool discardData = !DrawConnection();
+            const bool disconnectIssuedJustNow = m_disconnectIssued != wasDisconnectIssued;
+            if( discardData ) keepOpen = false;
+            if( disconnectIssuedJustNow || discardData ) ImGui::CloseCurrentPopup();
+            ImGui::EndPopup();
+        }
+    }
     std::shared_lock<std::shared_mutex> lock( m_worker.GetDataLock() );
     if( !m_worker.IsDataStatic() )
     {
@@ -678,6 +695,7 @@ bool View::DrawImpl()
 
     DrawFrames();
     DrawZones();
+
     ImGui::End();
 
     m_zoneHighlight = nullptr;
@@ -735,9 +753,7 @@ bool View::DrawConnection()
 
     {
         std::shared_lock<std::shared_mutex> lock( m_worker.GetMbpsDataLock() );
-        char tmp[2048];
+        TextFocused( "Connected to:", m_worker.GetAddr().c_str() );
-        sprintf( tmp, "%s###Connection", m_worker.GetAddr().c_str() );
-        ImGui::Begin( tmp, nullptr, ImGuiWindowFlags_AlwaysAutoResize );
         const auto& mbpsVector = m_worker.GetMbpsData();
         const auto mbps = mbpsVector.back();
         char buf[64];
@@ -759,7 +775,7 @@ bool View::DrawConnection()
     ImGui::Text( "Memory usage: %s", MemSizeToString( memUsage.load( std::memory_order_relaxed ) ) );
 
     const auto wpos = ImGui::GetWindowPos() + ImGui::GetWindowContentRegionMin();
-    ImGui::GetWindowDrawList()->AddCircleFilled( wpos + ImVec2( 1 + cs * 0.5, 3 + ty * 0.5 ), cs * 0.5, m_worker.IsConnected() ? 0xFF2222CC : 0xFF444444, 10 );
+    ImGui::GetWindowDrawList()->AddCircleFilled( wpos + ImVec2( 1 + cs * 0.5, 3 + ty * 1.75 ), cs * 0.5, m_worker.IsConnected() ? 0xFF2222CC : 0xFF444444, 10 );
 
     {
         std::shared_lock<std::shared_mutex> lock( m_worker.GetDataLock() );
@@ -855,7 +871,6 @@ bool View::DrawConnection()
         {
             ImGui::CloseCurrentPopup();
             ImGui::EndPopup();
-            ImGui::End();
             return false;
         }
         ImGui::SameLine( 0, ty * 2 );
@@ -866,7 +881,6 @@ bool View::DrawConnection()
         ImGui::EndPopup();
     }
 
-    ImGui::End();
     return true;
 }