Skip to content

MR-18: OverIn Tooltip and FreeType Fixes #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MindRapist wants to merge 1 commit into
base: main
Choose a base branch
from
Open

MR-18: OverIn Tooltip and FreeType Fixes #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ This repository contains the source code necessary to compile the game client ex

## 📋 Changelog
### 🐛 Bug fixes
- **Affect tooltips**: ALL affects now display realtime countdowns, titles and are wrapped in tooltips! Realtime countdowns does not apply to infinite affects such as the Exorcism Scroll, the Concentrated Reading and the Medal of the Dragon (Death penalty prevention)
- **AFFECT_FIRE**: The Continuous Fire debuff has been added to the affects dictionary by name.
- **Fixed OverIn Tooltip when in front of another slot/window**: Public fix applied and extended to prevent hover events in quest letters when an overlay is currently in front of them (such as the Help window).

<br>
<br>
Expand Down
3 changes: 2 additions & 1 deletion src/EterPythonLib/PythonSlotWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,9 +691,10 @@ void CSlotWindow::RefreshSlot()
OnRefreshSlot();

// NOTE : Refresh 될때 ToolTip 도 갱신 합니다 - [levites]
if (IsRendering())
if (IsRendering() && UI::CWindowManager::Instance().GetPointWindow() == this)
{
TSlot * pSlot;

if (GetPickedSlotPointer(&pSlot))
{
OnOverOutItem();
Expand Down
3 changes: 2 additions & 1 deletion src/EterPythonLib/PythonWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1902,6 +1902,7 @@ namespace UI
void CButton::OnUpdate()
{
}

void CButton::OnRender()
{
if (!IsShow())
Expand All @@ -1910,7 +1911,7 @@ namespace UI
if (m_pcurVisual)
{
if (m_isFlash)
if (!IsIn())
if (!IsIn() || this != UI::CWindowManager::Instance().GetPointWindow())
if (int(timeGetTime() / 500)%2)
{
return;
Expand Down