From fe3eab5815afc9b19c7e5dafbbc7ddd7668d028b Mon Sep 17 00:00:00 2001 From: KamFretoZ <14798312+kamfretoz@users.noreply.github.com> Date: Mon, 5 Aug 2024 16:08:30 +0700 Subject: [PATCH] Code: Formatting --- pcsx2-qt/Settings/GraphicsSettingsWidget.cpp | 40 ++++++++++---------- pcsx2/GS/GSCapture.cpp | 26 ++++++------- pcsx2/ImGui/ImGuiOverlays.cpp | 13 +++---- 3 files changed, 39 insertions(+), 40 deletions(-) diff --git a/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp b/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp index b8e6a21288..d8052699c5 100644 --- a/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp +++ b/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp @@ -337,7 +337,7 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget* m_ui.displayGridLayout->removeWidget(m_ui.widescreenPatches); m_ui.displayGridLayout->removeWidget(m_ui.noInterlacingPatches); safe_delete(m_ui.widescreenPatches); - safe_delete(m_ui.noInterlacingPatches); + safe_delete(m_ui.noInterlacingPatches); } // Hide advanced options by default. @@ -566,13 +566,13 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget* // Hardware Fixes tab { - dialog->registerWidgetHelp(m_ui.cpuSpriteRenderBW, tr("CPU Sprite Render Size"), tr("0 (Disabled)"), + dialog->registerWidgetHelp(m_ui.cpuSpriteRenderBW, tr("CPU Sprite Render Size"), tr("0 (Disabled)"), tr("The maximum target memory width that will allow the CPU Sprite Renderer to activate on.")); - dialog->registerWidgetHelp(m_ui.cpuCLUTRender, tr("Software CLUT Render"), tr("0 (Disabled)"), + dialog->registerWidgetHelp(m_ui.cpuCLUTRender, tr("Software CLUT Render"), tr("0 (Disabled)"), tr("Tries to detect when a game is drawing its own color palette and then renders it in software, instead of on the GPU.")); - dialog->registerWidgetHelp(m_ui.gpuTargetCLUTMode, tr("GPU Target CLUT"), tr("Disabled"), + dialog->registerWidgetHelp(m_ui.gpuTargetCLUTMode, tr("GPU Target CLUT"), tr("Disabled"), tr("Try to detect when a game is drawing its own color palette and then renders it on the GPU with special handling.")); dialog->registerWidgetHelp(m_ui.skipDrawStart, tr("Skipdraw Range Start"), tr("0"), @@ -704,7 +704,7 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget* dialog->registerWidgetHelp(m_ui.osdMessagesPos, tr("OSD Messages Position"), tr("Left (Default)"), tr("Shows on-screen-display messages when events occur such as save states being " "created/loaded, screenshots being taken, etc.")); - + dialog->registerWidgetHelp(m_ui.osdPerformancePos, tr("OSD Statistics Position"), tr("Right (Default)"), tr("Shows a variety of on-screen performance data points as selected by the user.")); @@ -733,9 +733,9 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget* dialog->registerWidgetHelp(m_ui.osdShowInputs, tr("Show Inputs"), tr("Unchecked"), tr("Shows the current controller state of the system in the bottom-left corner of the display.")); - dialog->registerWidgetHelp(m_ui.osdShowFrameTimes, tr("Show Frame Times"), tr("Unchecked"), + dialog->registerWidgetHelp(m_ui.osdShowFrameTimes, tr("Show Frame Times"), tr("Unchecked"), tr("Displays a graph showing the average frametimes.")); - + dialog->registerWidgetHelp(m_ui.osdShowVersion, tr("Show PCSX2 Version"), tr("Unchecked"), tr("Shows the current PCSX2 version on the top-right corner of the display.")); @@ -755,20 +755,20 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget* // Recording tab { dialog->registerWidgetHelp(m_ui.videoCaptureCodec, tr("Video Codec"), tr("Default"), tr("Selects which Video Codec to be used for Video Capture. " - - "If unsure, leave it on default.")); + + "If unsure, leave it on default.")); dialog->registerWidgetHelp(m_ui.videoCaptureFormat, tr("Video Format"), tr("Default"), tr("Selects which Video Format to be used for Video Capture. If by chance the codec does not support the format, the first format available will be used. " - - "If unsure, leave it on default.")); + + "If unsure, leave it on default.")); dialog->registerWidgetHelp(m_ui.videoCaptureBitrate, tr("Video Bitrate"), tr("6000 kbps"), tr("Sets the video bitrate to be used. " - - "Larger bitrate generally yields better video quality at the cost of larger resulting file size.")); + + "Larger bitrate generally yields better video quality at the cost of larger resulting file size.")); dialog->registerWidgetHelp(m_ui.videoCaptureResolutionAuto, tr("Automatic Resolution"), tr("Unchecked"), tr("When checked, the video capture resolution will follows the internal resolution of the running game.

" - - "Be careful when using this setting especially when you are upscaling, as higher internal resolution (above 4x) can results in very large video capture and can cause system overload.")); + + "Be careful when using this setting especially when you are upscaling, as higher internal resolution (above 4x) can results in very large video capture and can cause system overload.")); dialog->registerWidgetHelp(m_ui.enableVideoCaptureArguments, tr("Enable Extra Video Arguments"), tr("Unchecked"), tr("Allows you to pass arguments to the selected video codec.")); @@ -779,8 +779,8 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget* "For example: \"crf = 21 : preset = veryfast\"")); dialog->registerWidgetHelp(m_ui.audioCaptureCodec, tr("Audio Codec"), tr("Default"), tr("Selects which Audio Codec to be used for Video Capture. " - - "If unsure, leave it on default.")); + + "If unsure, leave it on default.")); dialog->registerWidgetHelp(m_ui.audioCaptureBitrate, tr("Audio Bitrate"), tr("160 kbps"), tr("Sets the audio bitrate to be used.")); @@ -918,7 +918,7 @@ void GraphicsSettingsWidget::onMessagesPosChanged() void GraphicsSettingsWidget::onPerformancePosChanged() { const bool enabled = m_ui.osdPerformancePos->currentIndex() != (m_dialog->isPerGameSettings() ? 1 : 0); - + m_ui.osdShowSpeed->setEnabled(enabled); m_ui.osdShowFPS->setEnabled(enabled); m_ui.osdShowCPU->setEnabled(enabled); @@ -1117,7 +1117,7 @@ void GraphicsSettingsWidget::updateRendererDependentOptions() // populate adapters std::vector adapters = GSGetAdapterInfo(type); const GSAdapterInfo* current_adapter_info = nullptr; - + // fill+select adapters { QSignalBlocker sb(m_ui.adapterDropdown); @@ -1260,7 +1260,7 @@ void GraphicsSettingsWidget::populateUpscaleMultipliers(u32 max_upscale_multipli else { m_ui.upscaleMultiplier->setCurrentIndex(0); - } + } } else { diff --git a/pcsx2/GS/GSCapture.cpp b/pcsx2/GS/GSCapture.cpp index 2af3f7a085..c9b0cff533 100644 --- a/pcsx2/GS/GSCapture.cpp +++ b/pcsx2/GS/GSCapture.cpp @@ -27,10 +27,10 @@ // We're using deprecated fields because we're targeting multiple ffmpeg versions. #if defined(_MSC_VER) -#pragma warning(disable:4996) // warning C4996: 'AVCodecContext::channels': was declared deprecated -#elif defined (__clang__) +#pragma warning(disable : 4996) // warning C4996: 'AVCodecContext::channels': was declared deprecated +#elif defined(__clang__) #pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined (__GNUC__) +#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif @@ -293,14 +293,14 @@ bool GSCapture::LoadFFmpeg(bool report_errors) if (report_errors) { - Host::ReportErrorAsync(TRANSLATE_SV("GSCapture","Failed to load FFmpeg"), - fmt::format(TRANSLATE_FS("GSCapture","You may be missing one or more files, or are using the incorrect version. This build of PCSX2 requires:\n" - " libavcodec: {}\n" - " libavformat: {}\n" - " libavutil: {}\n" - " libswscale: {}\n" - " libswresample: {}\n\n" - "Please see our official documentation for more information."), + Host::ReportErrorAsync(TRANSLATE_SV("GSCapture", "Failed to load FFmpeg"), + fmt::format(TRANSLATE_FS("GSCapture", "You may be missing one or more files, or are using the incorrect version. This build of PCSX2 requires:\n" + " libavcodec: {}\n" + " libavformat: {}\n" + " libavutil: {}\n" + " libswscale: {}\n" + " libswresample: {}\n\n" + "Please see our official documentation for more information."), LIBAVCODEC_VERSION_MAJOR, LIBAVFORMAT_VERSION_MAJOR, LIBAVUTIL_VERSION_MAJOR, LIBSWSCALE_VERSION_MAJOR, LIBSWRESAMPLE_VERSION_MAJOR)); } @@ -363,7 +363,7 @@ void GSCapture::LogAVError(int errnum, const char* format, ...) std::string GSCapture::GetCaptureTypeForMessage(bool capture_video, bool capture_audio) { - return capture_video ? capture_audio ? TRANSLATE("GSCapture","capturing audio and video") : TRANSLATE("GSCapture","capturing video") : TRANSLATE("GSCapture","capturing audio"); + return capture_video ? capture_audio ? TRANSLATE("GSCapture", "capturing audio and video") : TRANSLATE("GSCapture", "capturing video") : TRANSLATE("GSCapture", "capturing audio"); } bool GSCapture::IsUsingHardwareVideoEncoding() @@ -1528,7 +1528,7 @@ GSCapture::FormatList GSCapture::GetVideoFormatList(const char* codec) } // rawvideo doesn't have a list of formats. - if(v_codec->pix_fmts == nullptr) + if (v_codec->pix_fmts == nullptr) { Console.Error("(GetVideoFormatList) v_codec->pix_fmts is null."); return ret; diff --git a/pcsx2/ImGui/ImGuiOverlays.cpp b/pcsx2/ImGui/ImGuiOverlays.cpp index b9bc9eefc6..c997fcec46 100644 --- a/pcsx2/ImGui/ImGuiOverlays.cpp +++ b/pcsx2/ImGui/ImGuiOverlays.cpp @@ -358,8 +358,8 @@ __ri void ImGuiManager::DrawPerformanceOverlay(float& position_y, float scale, f __ri void ImGuiManager::DrawSettingsOverlay(float scale, float margin, float spacing) { - if (!GSConfig.OsdShowSettings || - FullscreenUI::HasActiveWindow()) + if (!GSConfig.OsdShowSettings || + FullscreenUI::HasActiveWindow()) return; std::string text; @@ -494,7 +494,7 @@ __ri void ImGuiManager::DrawSettingsOverlay(float scale, float margin, float spa __ri void ImGuiManager::DrawInputsOverlay(float scale, float margin, float spacing) { // Technically this is racing the CPU thread.. but it doesn't really matter, at worst, the inputs get displayed onscreen late. - if (!GSConfig.OsdShowInputs || + if (!GSConfig.OsdShowInputs || FullscreenUI::HasActiveWindow()) return; @@ -689,10 +689,9 @@ __ri void ImGuiManager::DrawInputRecordingOverlay(float& position_y, float scale __ri void ImGuiManager::DrawVideoCaptureOverlay(float& position_y, float scale, float margin, float spacing) { - if (!GSConfig.OsdShowVideoCapture || - !GSCapture::IsCapturing() || - FullscreenUI::HasActiveWindow() - ) + if (!GSConfig.OsdShowVideoCapture || + !GSCapture::IsCapturing() || + FullscreenUI::HasActiveWindow()) return; const float shadow_offset = std::ceil(scale);