Kaydet (Commit) 8ed4cb74 authored tarafından Caolán McNamara's avatar Caolán McNamara

gtk-menu-popup-delay only deprecated in gtk3 I think

Change-Id: I4bf77a912296f2d4a14c8bedf6b6bed6b52f9023
üst c301d8c8
...@@ -4159,19 +4159,19 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) ...@@ -4159,19 +4159,19 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
aStyleSet.SetCursorBlinkTime( STYLE_CURSOR_NOBLINKTIME ); aStyleSet.SetCursorBlinkTime( STYLE_CURSOR_NOBLINKTIME );
MouseSettings aMouseSettings = rSettings.GetMouseSettings(); MouseSettings aMouseSettings = rSettings.GetMouseSettings();
int iDoubleClickTime, iDoubleClickDistance, iDragThreshold; int iDoubleClickTime, iDoubleClickDistance, iDragThreshold, iMenuPopupDelay;
static const int MENU_POPUP_DELAY = 225;
g_object_get( pSettings, g_object_get( pSettings,
"gtk-double-click-time", &iDoubleClickTime, "gtk-double-click-time", &iDoubleClickTime,
"gtk-double-click-distance", &iDoubleClickDistance, "gtk-double-click-distance", &iDoubleClickDistance,
"gtk-dnd-drag-threshold", &iDragThreshold, "gtk-dnd-drag-threshold", &iDragThreshold,
"gtk-menu-popup-delay", &iMenuPopupDelay,
nullptr ); nullptr );
aMouseSettings.SetDoubleClickTime( iDoubleClickTime ); aMouseSettings.SetDoubleClickTime( iDoubleClickTime );
aMouseSettings.SetDoubleClickWidth( iDoubleClickDistance ); aMouseSettings.SetDoubleClickWidth( iDoubleClickDistance );
aMouseSettings.SetDoubleClickHeight( iDoubleClickDistance ); aMouseSettings.SetDoubleClickHeight( iDoubleClickDistance );
aMouseSettings.SetStartDragWidth( iDragThreshold ); aMouseSettings.SetStartDragWidth( iDragThreshold );
aMouseSettings.SetStartDragHeight( iDragThreshold ); aMouseSettings.SetStartDragHeight( iDragThreshold );
aMouseSettings.SetMenuDelay( MENU_POPUP_DELAY ); aMouseSettings.SetMenuDelay( iMenuPopupDelay );
rSettings.SetMouseSettings( aMouseSettings ); rSettings.SetMouseSettings( aMouseSettings );
gboolean showmenuicons = true, primarybuttonwarps = false; gboolean showmenuicons = true, primarybuttonwarps = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment