v2.17.4

Author: bernerdad

client/common/changelog.txt

@@ -1,3 +1,10 @@
+2.17.4 (04/09/2025)
+All:
+   * Improved highlight colours used in log viewer. #1213
+   * Fixed resize bar may be cut off when update banner is shown. #1465
+   * Fixed broken link in preferences. #1467
+
+
 2.17.3 (22/08/2025)
 All:
    * Improved native window colours in accordance with OS theme. #1213

client/common/version/windscribe_version.h

@@ -2,7 +2,7 @@
 
 #define WINDSCRIBE_MAJOR_VERSION 2
 #define WINDSCRIBE_MINOR_VERSION 17
-#define WINDSCRIBE_BUILD_VERSION 3
+#define WINDSCRIBE_BUILD_VERSION 4
 
 // only one of these should be enabled; neither -> stable
 //#define WINDSCRIBE_IS_BETA

client/gui/connectwindow/networktrustbutton.cpp

@@ -171,7 +171,7 @@ void NetworkTrustButton::onHoverEnter()
 void NetworkTrustButton::onHoverLeave()
 {
     startAnAnimation(opacityAnimation_, animProgress_, 0.7, ANIMATION_SPEED_FAST);
-    
+
     // Hide tooltip if it was shown
     if (isTextElided_) {
         TooltipController::instance().hideTooltip(TOOLTIP_ID_ELIDED_TEXT);

client/gui/locationswindow/widgetlocations/configfooterinfo.cpp

@@ -176,7 +176,10 @@ void ConfigFooterInfo::mouseReleaseEvent(QMouseEvent * /*event*/)
 
 void ConfigFooterInfo::onIconOpacityChanged(const QVariant &value, int index)
 {
-    WS_ASSERT(index >= 0 && index < NUM_ICONS);
+    if (index < 0 || index >= NUM_ICONS) {
+        WS_ASSERT(false);
+        return;
+    }
     iconButtons_[index].opacity = value.toDouble();
     update();
 }

client/gui/log/logviewerwindow.cpp

@@ -145,7 +145,13 @@ void LogViewerWindow::highlightBlocks()
         if (isColorHighlighting_) {
             RandomColor color;
             color.setSeed(hash);
-            int c = color.generate(RandomColor::RandomHue, isDarkTheme_ ? RandomColor::Dark : RandomColor::Light);
+
+            // Get the text color for contrast calculation
+            QColor textColor = textEdit_->palette().color(QPalette::Text);
+            int textColorRgb = (textColor.red() << 16) | (textColor.green() << 8) | textColor.blue();
+
+            int c = color.generateWithContrast(textColorRgb, RandomColor::RandomHue,
+                                               isDarkTheme_ ? RandomColor::Dark : RandomColor::Light);
             auto brush = QBrush(QColor(c));
             blockFormat.setBackground(brush);
         } else {
@@ -163,7 +169,8 @@ void LogViewerWindow::onWordWrapToggled(bool wordWrap)
 void LogViewerWindow::onOsThemeChanged(bool isDarkTheme)
 {
     isDarkTheme_ = isDarkTheme;
-    highlightBlocks();
+    // Delay to ensure palette has updated after theme change
+    QTimer::singleShot(100, this, [this]() { highlightBlocks(); });
 }
 
 } //namespace LogViewer

client/gui/log/randomcolor.cpp

@@ -9,6 +9,8 @@
 
 #include "randomcolor.h"
 #include <cassert>
+#include <cmath>
+#include <algorithm>
 
 /**
  * The map is formed with the help of the following sources:
@@ -273,3 +275,113 @@ int RandomColor::HSBtoRGB( double h, double s, double v ) const
     // Scale r, g, b to [0; 255] and pack them into a number 0xRRGGBB
     return (int(r * 255) << 16) + (int(g * 255) << 8) + int(b * 255);
 }
+
+int RandomColor::generateWithContrast( int textColor, Color color, Luminosity luminosity )
+{
+    double textLuminance = calculateRelativeLuminance(textColor);
+    double targetLuminance;
+
+    if (luminosity == Dark) {
+        // Dark mode - need dark background: (textLum + 0.05) / (bgLum + 0.05) >= 4.5
+        targetLuminance = (textLuminance + 0.05) / 4.5 - 0.05;
+        targetLuminance = std::max(0.05, std::min(0.4, targetLuminance)); // Keep backgrounds reasonably dark
+    } else {
+        // Light mode - need bright background: (bgLum + 0.05) / (textLum + 0.05) >= 4.5
+        double minRequired = (textLuminance + 0.05) * 4.5 - 0.05;
+        targetLuminance = std::max(0.6, std::min(0.9, minRequired)); // Keep backgrounds reasonably bright but not blinding
+    }
+
+    // Generate base hue and saturation
+    const ColorInfo& info = (color == RandomHue) ? getColorInfo(randomWithin({0, 359})) : colorMap[color];
+    const int h = randomWithin(info.hRange);
+    const int s = pickSaturation(info, luminosity);
+
+    // Generate color with exact target luminance
+    return generateColorWithTargetLuminance(h, s, targetLuminance);
+}
+
+double RandomColor::calculateContrastRatio( int color1, int color2 )
+{
+    double lum1 = calculateRelativeLuminance(color1);
+    double lum2 = calculateRelativeLuminance(color2);
+
+    if (lum1 < lum2) {
+        std::swap(lum1, lum2);
+    }
+
+    return (lum1 + 0.05) / (lum2 + 0.05);
+}
+
+double RandomColor::calculateRelativeLuminance( int rgbColor )
+{
+    double r = ((rgbColor >> 16) & 0xFF) / 255.0;
+    double g = ((rgbColor >> 8) & 0xFF) / 255.0;
+    double b = (rgbColor & 0xFF) / 255.0;
+
+    r = sRGBtoLinear(r);
+    g = sRGBtoLinear(g);
+    b = sRGBtoLinear(b);
+
+    return 0.2126 * r + 0.7152 * g + 0.0722 * b;
+}
+
+double RandomColor::sRGBtoLinear( double value )
+{
+    if (value <= 0.03928) {
+        return value / 12.92;
+    } else {
+        return pow((value + 0.055) / 1.055, 2.4);
+    }
+}
+
+double RandomColor::linearTosRGB( double value )
+{
+    if (value <= 0.0031308) {
+        return value * 12.92;
+    } else {
+        return 1.055 * pow(value, 1.0/2.4) - 0.055;
+    }
+}
+
+int RandomColor::generateColorWithTargetLuminance( int h, int s, double targetLuminance ) const
+{
+    // Convert HSV to RGB to get the hue and saturation ratios
+    double tempColor = HSBtoRGB(h, s, 50); // Use 50% brightness as baseline
+    int tempR = (int(tempColor) >> 16) & 0xFF;
+    int tempG = (int(tempColor) >> 8) & 0xFF;
+    int tempB = int(tempColor) & 0xFF;
+
+    // Calculate the relative contributions of R, G, B to luminance
+    // L = 0.2126*R + 0.7152*G + 0.0722*B (in linear space)
+    // We need to find a scaling factor that achieves target luminance
+
+    // Binary search for the right brightness multiplier
+    double minBrightness = 0.0;
+    double maxBrightness = 1.0;
+
+    for (int i = 0; i < 20; ++i) { // 20 iterations gives us good precision
+        double testBrightness = (minBrightness + maxBrightness) / 2.0;
+
+        // Scale the RGB values by brightness
+        int r = std::min(255, (int)(tempR * testBrightness * 2.0)); // *2 because we used 50% baseline
+        int g = std::min(255, (int)(tempG * testBrightness * 2.0));
+        int b = std::min(255, (int)(tempB * testBrightness * 2.0));
+
+        int testColor = (r << 16) | (g << 8) | b;
+        double actualLuminance = calculateRelativeLuminance(testColor);
+
+        if (actualLuminance < targetLuminance) {
+            minBrightness = testBrightness;
+        } else {
+            maxBrightness = testBrightness;
+        }
+    }
+
+    // Generate final color with calculated brightness
+    double finalBrightness = (minBrightness + maxBrightness) / 2.0;
+    int r = std::min(255, (int)(tempR * finalBrightness * 2.0));
+    int g = std::min(255, (int)(tempG * finalBrightness * 2.0));
+    int b = std::min(255, (int)(tempB * finalBrightness * 2.0));
+
+    return (r << 16) | (g << 8) | b;
+}

client/gui/log/randomcolor.h

@@ -131,6 +131,18 @@ class RandomColor
      */
     void setSeed( int seed );
 
+    /**
+     * Generates a color that has sufficient contrast with the specified text color.
+     * Returns a random color with at least 4.5:1 contrast ratio, in RGB format (0xRRGGBB).
+     */
+    int generateWithContrast( int textColor, Color color = RandomHue, Luminosity luminosity = Normal );
+
+    /**
+     * Calculates the contrast ratio between two RGB colors.
+     * Returns a value >= 1.0, where higher values indicate better contrast.
+     */
+    static double calculateContrastRatio( int color1, int color2 );
+
 private:
     struct SBRange
     {
@@ -157,6 +169,11 @@ class RandomColor
     int randomWithin( const Range& );
     int HSBtoRGB( double h, double s, double b ) const;
 
+    static double calculateRelativeLuminance( int rgbColor );
+    static double sRGBtoLinear( double value );
+    static double linearTosRGB( double value );
+    int generateColorWithTargetLuminance( int h, int s, double targetLuminance ) const;
+
     static const std::vector<ColorInfo> colorMap;
     std::default_random_engine randomEngine;
 #ifdef RANDOMCOLOR_THREAD_SAFE

client/gui/mainwindowcontroller.cpp

@@ -2904,7 +2904,7 @@ void MainWindowController::getGraphicsRegionWidthAndHeight(int &width, int &heig
     for (auto w : windowSizeManager_->windows()) {
         if (windowSizeManager_->isExclusivelyExpanded(w)) {
             width = w->boundingRect().width();
-            height = w->boundingRect().height();
+            height = w->boundingRect().height() + w->y();
             height += preferences_->appSkin() == APP_SKIN_VAN_GOGH ? (UPDATE_WIDGET_HEIGHT * updateWidgetAnimationProgress_)*G_SCALE : 0;
             return;
         }
@@ -2929,9 +2929,9 @@ void MainWindowController::getGraphicsRegionWidthAndHeight(int &width, int &heig
                     if (QGuiApplication::platformName() == "xcb") {
                         // For X11, as soon as a window starts animating, treat it as if the height were the full height.
                         // Otherwise, some items ping-pong between positions and the animation looks wrong.
-                        height = windowSizeManager_->windowHeight(w)*G_SCALE;
+                        height = windowSizeManager_->windowHeight(w)*G_SCALE + w->y();
                     } else {
-                        height = w->boundingRect().height();
+                        height = w->boundingRect().height() + w->y();
                     }
                     break;
                 }

client/gui/preferenceswindow/connectionwindow/connectionwindowitem.cpp

@@ -347,7 +347,7 @@ void ConnectionWindowItem::onLanguageChanged()
                                    QString("https://%1/features/firewall").arg(HardcodedSettings::instance().windscribeServerUrl()));
     connectionModeGroup_->setTitle(tr("Connection Mode"));
     connectionModeGroup_->setDescription(tr("Automatically choose the VPN protocol, or select one manually. NOTE: \"Preferred Protocol\" will override this setting."),
-                                         QString("https://%1/features/connection-mode").arg(HardcodedSettings::instance().windscribeServerUrl()));
+                                         QString("https://%1/features/flexible-connectivity").arg(HardcodedSettings::instance().windscribeServerUrl()));
     packetSizeGroup_->setDescription(tr("Automatically determine the MTU for your connection, or manually override.  This has no effect on TCP-based protocols."),
                                      QString("https://%1/features/packet-size").arg(HardcodedSettings::instance().windscribeServerUrl()));
     connectedDnsGroup_->setDescription(tr("Select the DNS server while connected to Windscribe."),

client/gui/sounds/soundmanager.cpp

@@ -9,7 +9,7 @@
 SoundManager::SoundManager(QObject *parent, Preferences *preferences)
     : QObject(parent), preferences_(preferences), audioEngineInitialized_(false), soundInitialized_(false), shouldLoop_(false), connectedEventQueued_(false)
 {
-    initialize();
+    initialize(); // NOLINT
 }
 
 SoundManager::~SoundManager()