Binary output view: Highlight byte range currently in view

[pulseview.git] / pv / globalsettings.cpp

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index 4fa9bc334d27e4e470ca30afe0ae0d52715da9e9..b59f6721acb313b3ee6a7ed281592f316fa265d1 100644 (file)
--- a/pv/globalsettings.cpp
+++ b/pv/globalsettings.cpp
@@ -58,6 +58,7 @@ const QString GlobalSettings::Key_View_ZoomToFitAfterAcq = "View_ZoomToFitAfterA
 const QString GlobalSettings::Key_View_TriggerIsZeroTime = "View_TriggerIsZeroTime";
 const QString GlobalSettings::Key_View_ColoredBG = "View_ColoredBG";
 const QString GlobalSettings::Key_View_StickyScrolling = "View_StickyScrolling";
+const QString GlobalSettings::Key_View_AllowVerticalDragging = "View_AllowVerticalDragging";
 const QString GlobalSettings::Key_View_ShowSamplingPoints = "View_ShowSamplingPoints";
 const QString GlobalSettings::Key_View_FillSignalHighAreas = "View_FillSignalHighAreas";
 const QString GlobalSettings::Key_View_FillSignalHighAreaColor = "View_FillSignalHighAreaColor";
@@ -124,6 +125,10 @@ void GlobalSettings::set_defaults_where_needed()
        if (!contains(Key_View_ZoomToFitAfterAcq))
                setValue(Key_View_ZoomToFitAfterAcq, true);
 
+       // Allow vertical dragging by default
+       if (!contains(Key_View_AllowVerticalDragging))
+               setValue(Key_View_AllowVerticalDragging, true);
+
        // Enable colored trace backgrounds by default
        if (!contains(Key_View_ColoredBG))
                setValue(Key_View_ColoredBG, true);
@@ -337,8 +342,11 @@ GVariant* GlobalSettings::restore_gvariant(QSettings &settings)
 
        QByteArray data = settings.value("value").toByteArray();
 
-       gpointer var_data = g_memdup((gconstpointer)data.constData(),
-               (guint)data.size());
+#if GLIB_CHECK_VERSION(2, 67, 3)  // See https://discourse.gnome.org/t/port-your-module-from-g-memdup-to-g-memdup2-now/5538
+       gpointer var_data = g_memdup2((gconstpointer)data.constData(), (guint)data.size());
+#else
+       gpointer var_data = g_memdup((gconstpointer)data.constData(), (guint)data.size());
+#endif
 
        GVariant *value = g_variant_new_from_data(var_type, var_data,
                data.size(), false, g_free, var_data);
@@ -363,8 +371,11 @@ Glib::VariantBase GlobalSettings::restore_variantbase(QSettings &settings)
 
        QByteArray data = settings.value("value").toByteArray();
 
-       gpointer var_data = g_memdup((gconstpointer)data.constData(),
-               (guint)data.size());
+#if GLIB_CHECK_VERSION(2, 67, 3)  // See https://discourse.gnome.org/t/port-your-module-from-g-memdup-to-g-memdup2-now/5538
+       gpointer var_data = g_memdup2((gconstpointer)data.constData(), (guint)data.size());
+#else
+       gpointer var_data = g_memdup((gconstpointer)data.constData(), (guint)data.size());
+#endif
 
        GVariant *value = g_variant_new_from_data(var_type, var_data,
                data.size(), false, g_free, var_data);