Mercurial > octave
comparison libgui/src/gui-settings.h @ 31640:e518e1f7e944
Backed out changeset 34c3cd39c4b9
Revert change because there is code that uses gui_pref.ignore, but
only on MAC_OS: global_use_native_dialogs in
gui-preferences-global.h. Are there others?
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 05 Dec 2022 10:17:17 -0500 |
parents | 474e184321d3 |
children | 431f80aba37a |
comparison
equal
deleted
inserted
replaced
31639:ca7d58406f82 | 31640:e518e1f7e944 |
---|---|
73 | 73 |
74 using QSettings::value; | 74 using QSettings::value; |
75 | 75 |
76 QVariant value (const gui_pref& pref) const | 76 QVariant value (const gui_pref& pref) const |
77 { | 77 { |
78 if (pref.ignore) | |
79 return pref.def; // ignore the current pref and always use default | |
80 | |
78 return value (pref.key, pref.def); | 81 return value (pref.key, pref.def); |
79 } | 82 } |
80 | 83 |
81 /*! | 84 /*! |
82 Reading a color from the given QVaraitn @p def taking different | 85 Reading a color from the given QVaraitn @p def taking different |