chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Fixed Bar/Histogram meters containing wrong width/height values when used with images

Browse Source
This commit is contained in:
Brian Ferguson 2012-08-04 17:15:56 -06:00
parent e2ce7d59a7
commit 90c81e01d1
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Meter.cpp
View File

@ -292,7 +292,7 @@ void CMeter::ReadOptions(CConfigParser& parser, const WCHAR* section)
} }
bool oldWDefined = m_WDefined; bool oldWDefined = m_WDefined;
m_W = parser.ReadInt(section, L"W", m_W); m_W = IsFixedSize(true) ? parser.ReadInt(section, L"W", m_W) : m_W;
m_WDefined = parser.GetLastValueDefined(); m_WDefined = parser.GetLastValueDefined();
if (!m_WDefined && oldWDefined && IsFixedSize()) if (!m_WDefined && oldWDefined && IsFixedSize())
{ {
@ -300,7 +300,7 @@ void CMeter::ReadOptions(CConfigParser& parser, const WCHAR* section)
} }
bool oldHDefined = m_HDefined; bool oldHDefined = m_HDefined;
m_H = parser.ReadInt(section, L"H", m_H); m_H = IsFixedSize(true) ? parser.ReadInt(section, L"H", m_H) : m_H;
m_HDefined = parser.GetLastValueDefined(); m_HDefined = parser.GetLastValueDefined();
if (!m_HDefined && oldHDefined && IsFixedSize()) if (!m_HDefined && oldHDefined && IsFixedSize())
{ {

2
Library/Meter.h
View File

@ -120,7 +120,7 @@ protected:
virtual void ReadOptions(CConfigParser& parser, const WCHAR* section); virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
virtual void BindMeasures(CConfigParser& parser, const WCHAR* section); virtual void BindMeasures(CConfigParser& parser, const WCHAR* section);
virtual bool IsFixedSize() { return true; } virtual bool IsFixedSize(bool overwrite = false) { return true; }
bool BindPrimaryMeasure(CConfigParser& parser, const WCHAR* section, bool optional); bool BindPrimaryMeasure(CConfigParser& parser, const WCHAR* section, bool optional);
void BindSecondaryMeasures(CConfigParser& parser, const WCHAR* section); void BindSecondaryMeasures(CConfigParser& parser, const WCHAR* section);

2
Library/MeterBar.h
View File

@ -37,7 +37,7 @@ public:
protected: protected:
virtual void ReadOptions(CConfigParser& parser, const WCHAR* section); virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
virtual bool IsFixedSize() { return m_ImageName.empty(); } virtual bool IsFixedSize(bool overwrite = false) { return m_ImageName.empty(); }
private: private:
enum ORIENTATION enum ORIENTATION

2
Library/MeterButton.h
View File

@ -46,7 +46,7 @@ protected:
virtual void ReadOptions(CConfigParser& parser, const WCHAR* section); virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
virtual void BindMeasures(CConfigParser& parser, const WCHAR* section); virtual void BindMeasures(CConfigParser& parser, const WCHAR* section);
virtual bool IsFixedSize() { return false; } virtual bool IsFixedSize(bool overwrite = false) { return overwrite; }
private: private:
bool HitTest2(int px, int py, bool checkAlpha); bool HitTest2(int px, int py, bool checkAlpha);

2
Library/MeterHistogram.h
View File

@ -38,7 +38,7 @@ protected:
virtual void ReadOptions(CConfigParser& parser, const WCHAR* section); virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
virtual void BindMeasures(CConfigParser& parser, const WCHAR* section); virtual void BindMeasures(CConfigParser& parser, const WCHAR* section);
virtual bool IsFixedSize() { return m_PrimaryImageName.empty(); } virtual bool IsFixedSize(bool overwrite = false) { return m_PrimaryImageName.empty(); }
private: private:
void DisposeBuffer(); void DisposeBuffer();

2
Library/MeterImage.h
View File

@ -38,7 +38,7 @@ protected:
virtual void ReadOptions(CConfigParser& parser, const WCHAR* section); virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
virtual void BindMeasures(CConfigParser& parser, const WCHAR* section); virtual void BindMeasures(CConfigParser& parser, const WCHAR* section);
virtual bool IsFixedSize() { return m_ImageName.empty(); } virtual bool IsFixedSize(bool overwrite = false) { return m_ImageNameResult.empty(); }
private: private:
void LoadImage(const std::wstring& imageName, bool bLoadAlways); void LoadImage(const std::wstring& imageName, bool bLoadAlways);

2
Library/MeterString.h
View File

@ -47,7 +47,7 @@ protected:
virtual void ReadOptions(CConfigParser& parser, const WCHAR* section); virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
virtual void BindMeasures(CConfigParser& parser, const WCHAR* section); virtual void BindMeasures(CConfigParser& parser, const WCHAR* section);
virtual bool IsFixedSize() { return false; } virtual bool IsFixedSize(bool overwrite = false) { return overwrite; }
private: private:
enum TEXTSTYLE enum TEXTSTYLE