Macintosh-SW/tenfourfox
1
0
Fork 0
mirror of https://github.com/classilla/tenfourfox.git synced 2024-05-28 20:41:33 +00:00
Code Issues Projects Releases Wiki Activity

#417: remove more code from LookAndFeel; tune up a bit

Browse Source
This commit is contained in:
Cameron Kaiser 2017-08-31 18:58:40 -07:00
parent 8524974786
commit 0792006231
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
widget/cocoa/nsLookAndFeel.mm
View File

@ -347,7 +347,7 @@ nsLookAndFeel::GetIntImpl(IntID aID, int32_t &aResult)
aResult = 4; aResult = 4;
break; break;
case eIntID_ScrollArrowStyle: case eIntID_ScrollArrowStyle:
#if(0) #ifdef __LP64__
if (nsCocoaFeatures::OnLionOrLater()) { if (nsCocoaFeatures::OnLionOrLater()) {
// OS X Lion's scrollbars have no arrows // OS X Lion's scrollbars have no arrows
aResult = eScrollArrow_None; aResult = eScrollArrow_None;
@ -374,18 +374,24 @@ nsLookAndFeel::GetIntImpl(IntID aID, int32_t &aResult)
aResult = eScrollThumbStyle_Proportional; aResult = eScrollThumbStyle_Proportional;
break; break;
case eIntID_UseOverlayScrollbars: case eIntID_UseOverlayScrollbars:
aResult = 0;
#ifdef __LP64__
if (!mUseOverlayScrollbarsCached) { if (!mUseOverlayScrollbarsCached) {
mUseOverlayScrollbars = SystemWantsOverlayScrollbars() ? 1 : 0; mUseOverlayScrollbars = SystemWantsOverlayScrollbars() ? 1 : 0;
mUseOverlayScrollbarsCached = true; mUseOverlayScrollbarsCached = true;
} }
aResult = mUseOverlayScrollbars; aResult = mUseOverlayScrollbars;
#endif
break; break;
case eIntID_AllowOverlayScrollbarsOverlap: case eIntID_AllowOverlayScrollbarsOverlap:
aResult = 0;
#ifdef __LP64__
if (!mAllowOverlayScrollbarsOverlapCached) { if (!mAllowOverlayScrollbarsOverlapCached) {
mAllowOverlayScrollbarsOverlap = AllowOverlayScrollbarsOverlap() ? 1 : 0; mAllowOverlayScrollbarsOverlap = AllowOverlayScrollbarsOverlap() ? 1 : 0;
mAllowOverlayScrollbarsOverlapCached = true; mAllowOverlayScrollbarsOverlapCached = true;
} }
aResult = mAllowOverlayScrollbarsOverlap; aResult = mAllowOverlayScrollbarsOverlap;
#endif
break; break;
case eIntID_ScrollbarDisplayOnMouseMove: case eIntID_ScrollbarDisplayOnMouseMove:
aResult = 0; aResult = 0;
@ -474,10 +480,12 @@ nsLookAndFeel::GetIntImpl(IntID aID, int32_t &aResult)
break; break;
case eIntID_SwipeAnimationEnabled: case eIntID_SwipeAnimationEnabled:
aResult = 0; aResult = 0;
#ifdef __LP64__
if ([NSEvent respondsToSelector:@selector( if ([NSEvent respondsToSelector:@selector(
isSwipeTrackingFromScrollEventsEnabled)]) { isSwipeTrackingFromScrollEventsEnabled)]) {
aResult = [NSEvent isSwipeTrackingFromScrollEventsEnabled] ? 1 : 0; aResult = [NSEvent isSwipeTrackingFromScrollEventsEnabled] ? 1 : 0;
} }
#endif
break; break;
case eIntID_ColorPickerAvailable: case eIntID_ColorPickerAvailable:
aResult = 1; aResult = 1;

8
widget/nsXPLookAndFeel.cpp
View File

@ -821,7 +821,7 @@ nsXPLookAndFeel::GetColorImpl(ColorID aID, bool aUseStandinsForNativeColors,
nsresult nsresult
nsXPLookAndFeel::GetIntImpl(IntID aID, int32_t &aResult) nsXPLookAndFeel::GetIntImpl(IntID aID, int32_t &aResult)
{ {
if (!sInitialized) if (MOZ_UNLIKELY(!sInitialized))
Init(); Init();
// Set the default values for these prefs. but allow different platforms // Set the default values for these prefs. but allow different platforms
@ -845,7 +845,7 @@ nsXPLookAndFeel::GetIntImpl(IntID aID, int32_t &aResult)
} }
for (unsigned int i = 0; i < ArrayLength(sIntPrefs); ++i) { for (unsigned int i = 0; i < ArrayLength(sIntPrefs); ++i) {
if (sIntPrefs[i].isSet && (sIntPrefs[i].id == aID)) { if (MOZ_UNLIKELY(sIntPrefs[i].isSet && (sIntPrefs[i].id == aID))) {
aResult = sIntPrefs[i].intVar; aResult = sIntPrefs[i].intVar;
return NS_OK; return NS_OK;
} }
@ -857,11 +857,11 @@ nsXPLookAndFeel::GetIntImpl(IntID aID, int32_t &aResult)
nsresult nsresult
nsXPLookAndFeel::GetFloatImpl(FloatID aID, float &aResult) nsXPLookAndFeel::GetFloatImpl(FloatID aID, float &aResult)
{ {
if (!sInitialized) if (MOZ_UNLIKELY(!sInitialized))
Init(); Init();
for (unsigned int i = 0; i < ArrayLength(sFloatPrefs); ++i) { for (unsigned int i = 0; i < ArrayLength(sFloatPrefs); ++i) {
if (sFloatPrefs[i].isSet && sFloatPrefs[i].id == aID) { if (MOZ_UNLIKELY(sFloatPrefs[i].isSet && sFloatPrefs[i].id == aID)) {
aResult = sFloatPrefs[i].floatVar; aResult = sFloatPrefs[i].floatVar;
return NS_OK; return NS_OK;
} }