mirror of
https://github.com/chibicitiberiu/rainmeter-studio.git
synced 2024-02-24 04:33:31 +00:00
Added MeterStyle functionality:
Rainy, given the "issues" listed at the bottom of this comment, I leave it to you whether to create a build using this revision or use r208 for the build. I would like to start testing MeterStyle, but there are a few more things it needs work on. What is MeterStyle? MeterStyle This will allow users to create CSS-like "Styles" for meters. This means that all the parameters of a meter can be defined in the style, and then many meters can use the style to eliminate copy / pasting the same parameters over and over on multiple meters. (Examples: FontColor=, FontSize= etc.) How do I use it? You will create a new [Section] (as many as you want) in the .ini. The section(s) can have any name. [MyStringStyle] Then you will tell Rainmeter that this is a "MeterStyle" and not a measure or meter Style=Meter Note: The "value" of the key "Style" can be anything. It can be used to add a description of the style if you like. Style=This style is for the AccuWeather part of this skin It is however required, both to tell Rainmeter it is not a meter or measure and to have the MeterStyle routines parse it. Then you define parameters you want to use in the style FontColor=#FontColor# FontFace=TheSansBold-Caps FontSize=11 StringEffect=SHADOW StringStyle=BOLD StringAlign=LEFT AntiAlias=1 Then in any or all meters, you just use [MeterName] Meter=STRING (or any other meter type) MeterStyle=MyStringStyle None of the parameters in the style are then required to be actually in the meter(s). They are "inherited" from the MeterStyle. Note: This works and has had preliminary testing with dynamic variables like FontColor=[MeasureName] and regular variables like FontColor=#FontColor#. It doesn't matter if the [Variables] section or the [MeasureName] measure is before or after the [StyleName] in the .ini file. What if I want to override a MeterStyle parameter on a meter? Sure. Just put in any parameter with a value different from the one defined in the MeterStyle and the one in the meter will take presidence. All non-defined parameters will still use the MeterStyle value. [MeterName] Meter=STRING MeterStyle=MyStringStyle FontColor=100,100,100,50 What are these "known issues" you are on about? This is still a bit of a work in progress. Right now you cannot define X or Y in a style. You can define W and H, but NOT for a STRING meter. You cannot define a "Transformation Matrix" in a style. MattKing will be looking into these tomorrow. W and H in a string meter is our top priority. We will also look at X and Y and hope for an easy solution. Transformation Matrix may have to come later.
This commit is contained in:
@ -86,7 +86,7 @@ void CMeterLine::ReadConfig(const WCHAR* section)
|
||||
|
||||
CConfigParser& parser = m_MeterWindow->GetParser();
|
||||
|
||||
int lineCount = parser.ReadInt(section, L"LineCount", 1);
|
||||
int lineCount = parser.ReadInt(section, L"LineCount", parser.ReadInt(m_StyleName.c_str(), L"LineCount", 1));
|
||||
|
||||
for (i = 0; i < lineCount; i++)
|
||||
{
|
||||
@ -99,7 +99,7 @@ void CMeterLine::ReadConfig(const WCHAR* section)
|
||||
swprintf(tmpName, L"LineColor%i", i + 1);
|
||||
}
|
||||
|
||||
m_Colors.push_back(parser.ReadColor(section, tmpName, Color::White));
|
||||
m_Colors.push_back(parser.ReadColor(section, tmpName, parser.ReadColor(m_StyleName.c_str(), tmpName, Color::White)));
|
||||
|
||||
if (i == 0)
|
||||
{
|
||||
@ -110,21 +110,21 @@ void CMeterLine::ReadConfig(const WCHAR* section)
|
||||
swprintf(tmpName, L"Scale%i", i + 1);
|
||||
}
|
||||
|
||||
m_ScaleValues.push_back(parser.ReadFloat(section, tmpName, 1.0));
|
||||
m_ScaleValues.push_back(parser.ReadFloat(section, tmpName, parser.ReadFloat(m_StyleName.c_str(), tmpName, 1.0)));
|
||||
|
||||
if (i != 0)
|
||||
{
|
||||
swprintf(tmpName, L"MeasureName%i", i + 1);
|
||||
m_MeasureNames.push_back(parser.ReadString(section, tmpName, L""));
|
||||
m_MeasureNames.push_back(parser.ReadString(section, tmpName, parser.ReadString(m_StyleName.c_str(), tmpName, L"").c_str(),true,true));
|
||||
}
|
||||
}
|
||||
|
||||
m_Flip = 0!=parser.ReadInt(section, L"Flip", 0);
|
||||
m_Autoscale = 0!=parser.ReadInt(section, L"AutoScale", 0);
|
||||
m_LineWidth = parser.ReadFloat(section, L"LineWidth", 1.0);
|
||||
m_HorizontalLines = 0!=parser.ReadInt(section, L"HorizontalLines", 0);
|
||||
m_HorizontalColor = parser.ReadColor(section, L"HorizontalColor", Color::Black); // This is left here for backwards compatibility
|
||||
m_HorizontalColor = parser.ReadColor(section, L"HorizontalLineColor", m_HorizontalColor); // This is what it should be
|
||||
m_Flip = 0!=parser.ReadInt(section, L"Flip", 0!=parser.ReadInt(m_StyleName.c_str(), L"Flip", 0));
|
||||
m_Autoscale = 0!=parser.ReadInt(section, L"AutoScale", 0!=parser.ReadInt(m_StyleName.c_str(), L"AutoScale", 0));
|
||||
m_LineWidth = parser.ReadFloat(section, L"LineWidth", parser.ReadFloat(m_StyleName.c_str(), L"LineWidth", 1.0));
|
||||
m_HorizontalLines = 0!=parser.ReadInt(section, L"HorizontalLines", 0!=parser.ReadInt(m_StyleName.c_str(), L"HorizontalLines", 0));
|
||||
m_HorizontalColor = parser.ReadColor(section, L"HorizontalColor", parser.ReadColor(m_StyleName.c_str(), L"HorizontalColor", Color::Black)); // This is left here for backwards compatibility
|
||||
m_HorizontalColor = parser.ReadColor(section, L"HorizontalLineColor", parser.ReadColor(m_StyleName.c_str(), L"HorizontalLineColor", m_HorizontalColor)); // This is what it should be
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user