Kaydet (Commit) 25befc0a authored tarafından Julien Nabet's avatar Julien Nabet Kaydeden (comit) Caolán McNamara

GtkSettings:gtk-menu-popup-delay deprecated

I took example from https://mail.gnome.org/archives/commits-list/2013-June/msg06434.html

Change-Id: I5fb090c3245848c92238f34259f1a2f77f9080c7
Reviewed-on: https://gerrit.libreoffice.org/16432Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 5427d69f
...@@ -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, iMenuPopupDelay; int iDoubleClickTime, iDoubleClickDistance, iDragThreshold;
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( iMenuPopupDelay ); aMouseSettings.SetMenuDelay( MENU_POPUP_DELAY );
rSettings.SetMouseSettings( aMouseSettings ); rSettings.SetMouseSettings( aMouseSettings );
gboolean showmenuicons = true, primarybuttonwarps = false; gboolean showmenuicons = true, primarybuttonwarps = false;
......
...@@ -1724,19 +1724,19 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) ...@@ -1724,19 +1724,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, iMenuPopupDelay; int iDoubleClickTime, iDoubleClickDistance, iDragThreshold;
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( iMenuPopupDelay ); aMouseSettings.SetMenuDelay( MENU_POPUP_DELAY );
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