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

Cosmetics

Browse Source 
- Removed reset parameter from MeterWindow::UpdateWindow(). It was for NativeTransparency support.
This commit is contained in:
spx 2013-10-20 22:18:13 +09:00
parent 95c8709de7
commit f5d875e7a3
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/MeterWindow.cpp
View File

@ -423,7 +423,8 @@ void MeterWindow::Refresh(bool init, bool all)
m_Hidden = m_WindowStartHidden; m_Hidden = m_WindowStartHidden;
// Set the window region // Set the window region
UpdateWindow(m_AlphaValue, true); // Add/Remove layered flag AddWindowExStyle(WS_EX_LAYERED);
UpdateWindow(m_AlphaValue);
Update(true); Update(true);
if (m_BlurMode == BLURMODE_NONE) if (m_BlurMode == BLURMODE_NONE)
@ -2636,7 +2637,7 @@ void MeterWindow::Redraw()
} }
} }
UpdateWindow(m_TransparencyValue, false, true); UpdateWindow(m_TransparencyValue, true);
m_Canvas->EndDraw(); m_Canvas->EndDraw();
} }
@ -2810,13 +2811,8 @@ void MeterWindow::Update(bool refresh)
** Updates the window contents ** Updates the window contents
** **
*/ */
void MeterWindow::UpdateWindow(int alpha, bool reset, bool canvasBeginDrawCalled) void MeterWindow::UpdateWindow(int alpha, bool canvasBeginDrawCalled)
{ {
if (reset)
{
AddWindowExStyle(WS_EX_LAYERED);
}
BLENDFUNCTION blendPixelFunction = {AC_SRC_OVER, 0, alpha, AC_SRC_ALPHA}; BLENDFUNCTION blendPixelFunction = {AC_SRC_OVER, 0, alpha, AC_SRC_ALPHA};
POINT ptWindowScreenPosition = {m_ScreenX, m_ScreenY}; POINT ptWindowScreenPosition = {m_ScreenX, m_ScreenY};
POINT ptSrc = {0, 0}; POINT ptSrc = {0, 0};

4
Library/MeterWindow.h
View File

@ -134,7 +134,7 @@ public:
void Deactivate(); void Deactivate();
void Refresh(bool init, bool all = false); void Refresh(bool init, bool all = false);
void Redraw(); void Redraw();
void RedrawWindow() { UpdateWindow(m_TransparencyValue, false); } void RedrawWindow() { UpdateWindow(m_TransparencyValue); }
void SetVariable(const std::wstring& variable, const std::wstring& value); void SetVariable(const std::wstring& variable, const std::wstring& value);
void SetOption(const std::wstring& section, const std::wstring& option, const std::wstring& value, bool group); void SetOption(const std::wstring& section, const std::wstring& option, const std::wstring& value, bool group);
@ -292,7 +292,7 @@ private:
bool UpdateMeasure(Measure* measure, bool force); bool UpdateMeasure(Measure* measure, bool force);
bool UpdateMeter(Meter* meter, bool& bActiveTransition, bool force); bool UpdateMeter(Meter* meter, bool& bActiveTransition, bool force);
void Update(bool refresh); void Update(bool refresh);
void UpdateWindow(int alpha, bool reset, bool canvasBeginDrawCalled = false); void UpdateWindow(int alpha, bool canvasBeginDrawCalled = false);
void UpdateWindowTransparency(int alpha); void UpdateWindowTransparency(int alpha);
void ReadOptions(); void ReadOptions();
void WriteOptions(INT setting = OPTION_ALL); void WriteOptions(INT setting = OPTION_ALL);