Browse Source

Fix ptGUIControl.setFontFlags().

Christian Walther 11 years ago committed by Anne Marije v/d Meer
parent
commit
bee6001b78
  1. 2
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.h
  2. 4
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListBoxMod.cpp
  3. 2
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.h
  4. 2
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUITextBoxMod.h
  5. 1
      Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.h

@ -246,6 +246,8 @@ class pfGUIControlMod : public plSingleModifier
virtual void SetColorScheme( pfGUIColorScheme *newScheme ); virtual void SetColorScheme( pfGUIColorScheme *newScheme );
pfGUIColorScheme *GetColorScheme( void ) const; pfGUIColorScheme *GetColorScheme( void ) const;
virtual void UpdateColorScheme() { IPostSetUpDynTextMap(); IUpdate(); }
// should be override by specific GUIcontrol // should be override by specific GUIcontrol
virtual void PurgeDynaTextMapImage() {;} virtual void PurgeDynaTextMapImage() {;}

4
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListBoxMod.cpp

@ -180,6 +180,10 @@ bool pfGUIListBoxMod::MsgReceive( plMessage *msg )
void pfGUIListBoxMod::IPostSetUpDynTextMap( void ) void pfGUIListBoxMod::IPostSetUpDynTextMap( void )
{ {
pfGUIColorScheme *scheme = GetColorScheme();
fDynTextMap->SetFont( scheme->fFontFace, scheme->fFontSize, scheme->fFontFlags,
HasFlag( kXparentBgnd ) ? false : true );
ICalcWrapStarts(); ICalcWrapStarts();
ICalcScrollRange(); ICalcScrollRange();
fReadyToRoll = true; fReadyToRoll = true;

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.h

@ -211,6 +211,8 @@ class pfGUIMultiLineEditCtrl : public pfGUIControlMod
virtual void PurgeDynaTextMapImage(); virtual void PurgeDynaTextMapImage();
virtual void UpdateColorScheme() { fFontFlagsSet = 0; pfGUIControlMod::UpdateColorScheme(); }
// Extended event types // Extended event types
enum ExtendedEvents enum ExtendedEvents
{ {

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUITextBoxMod.h

@ -101,8 +101,6 @@ class pfGUITextBoxMod : public pfGUIControlMod
void SetLocalizationPath(const plString& path); void SetLocalizationPath(const plString& path);
void SetUseLocalizationPath(bool use); void SetUseLocalizationPath(bool use);
virtual void UpdateColorScheme() { IPostSetUpDynTextMap(); IUpdate(); }
}; };
#endif // _pfGUITextBoxMod_h #endif // _pfGUITextBoxMod_h

1
Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp

@ -456,6 +456,7 @@ void pyGUIControl::SetFontFlags(uint8_t fontFlags)
{ {
pfGUIColorScheme* colorscheme = pdmod->GetColorScheme(); pfGUIColorScheme* colorscheme = pdmod->GetColorScheme();
colorscheme->fFontFlags = fontFlags; colorscheme->fFontFlags = fontFlags;
pdmod->UpdateColorScheme();
} }
} }
} }

Loading…
Cancel
Save