Path Manager: (pre ImGui uilist) cataimgui::draw_colored_text -> draw_colored_text

Author: Brambor

src/path_manager.cpp

@@ -172,6 +172,7 @@ class path_manager_ui : public cataimgui::window
 
         input_context ctxt = input_context( "PATH_MANAGER" );
         void enabled_active_button( const std::string action, bool enabled );
+        void draw_distance_from_tile( const tripoint_abs_ms &tile );
     protected:
         void draw_controls() override;
         cataimgui::bounds get_bounds() override;
@@ -503,28 +504,28 @@ void path_manager_ui::enabled_active_button( const std::string action, bool enab
     ImGui::EndDisabled();
 }
 
-static void draw_distance_from_tile( const tripoint_abs_ms &tile )
+void path_manager_ui::draw_distance_from_tile( const tripoint_abs_ms &tile )
 {
     const tripoint_abs_ms &avatar_pos = get_map().getglobal( get_avatar().pos_bub() );
     if( avatar_pos == tile ) {
-        cataimgui::draw_colored_text( _( "It's under your feet." ), c_light_green );
+        draw_colored_text( _( "It's under your feet." ), c_light_green );
     } else {
         const std::string dist = direction_suffix( avatar_pos, tile );
-        cataimgui::draw_colored_text( dist );
+        draw_colored_text( dist );
     }
 }
 
 void path_manager_ui::draw_controls()
 {
     // walk buttons
-    cataimgui::draw_colored_text( _( "Walk:" ) );
+    draw_colored_text( _( "Walk:" ) );
     ImGui::SameLine();
     enabled_active_button( "WALK_PATH", pimpl->avatar_at_what_start_or_end() != -1 );
     ImGui::SameLine();
     enabled_active_button( "WALK_PATH_FROM_MIDDLE", !pimpl->avatar_at_what_paths().empty() );
 
     // recording buttons
-    cataimgui::draw_colored_text( _( "Recording:" ) );
+    draw_colored_text( _( "Recording:" ) );
     ImGui::SameLine();
     enabled_active_button( "START_RECORDING", !pimpl->is_recording_path() );
     ImGui::SameLine();
@@ -534,7 +535,7 @@ void path_manager_ui::draw_controls()
     enabled_active_button( "STOP_RECORDING", pimpl->is_recording_path() );
 
     // manage buttons
-    cataimgui::draw_colored_text( _( "Manage:" ) );
+    draw_colored_text( _( "Manage:" ) );
     ImGui::SameLine();
     enabled_active_button( "DELETE_PATH", pimpl->selected_id != -1 );
     ImGui::SameLine();
@@ -544,7 +545,7 @@ void path_manager_ui::draw_controls()
                            pimpl->selected_id + 1 < static_cast<int>( pimpl->paths.size() ) );
 
     // name buttons
-    cataimgui::draw_colored_text( _( "Rename:" ) );
+    draw_colored_text( _( "Rename:" ) );
     ImGui::SameLine();
     enabled_active_button( "RENAME_START", pimpl->selected_id != -1 );
     ImGui::SameLine();
@@ -577,13 +578,13 @@ void path_manager_ui::draw_controls()
                 pimpl->selected_id = i;
             }
             ImGui::SameLine();
-            cataimgui::draw_colored_text( curr_path.name_start );
+            draw_colored_text( curr_path.name_start );
 
             ImGui::TableNextColumn();
             draw_distance_from_tile( curr_path.recorded_path.front() );
 
             ImGui::TableNextColumn();
-            cataimgui::draw_colored_text( curr_path.name_end );
+            draw_colored_text( curr_path.name_end );
 
             ImGui::TableNextColumn();
             draw_distance_from_tile( curr_path.recorded_path.back() );