mirror of
https://github.com/edubart/otclient.git
synced 2025-10-15 12:04:55 +02:00
Refactor modules, closes #223
* All modules are sandboxed now * All images,sounds,fonts,translations and styles were moved to "data" folder * Reorganize image files folders * Remove unmaintained modules: client_particles, client_shaders * Implement new automatic way to load styles and fonts * Add hide/show offline option in VipList * Add invite/exclude to/from private channel in players menus * Many other minor changes
This commit is contained in:
@@ -43,7 +43,9 @@ void CachedText::draw(const Rect& rect)
|
||||
m_textCoordsBuffer.clear();
|
||||
m_font->calculateDrawTextCoords(m_textCoordsBuffer, m_text, rect, Fw::AlignCenter);
|
||||
}
|
||||
g_painter->drawTextureCoords(m_textCoordsBuffer, m_font->getTexture());
|
||||
|
||||
if(m_font->getTexture())
|
||||
g_painter->drawTextureCoords(m_textCoordsBuffer, m_font->getTexture());
|
||||
}
|
||||
|
||||
void CachedText::update()
|
||||
|
@@ -28,25 +28,26 @@ Mouse g_mouse;
|
||||
|
||||
void Mouse::setTargetCursor()
|
||||
{
|
||||
g_window.setMouseCursor("/cursors/targetcursor.png", Point(9, 9));
|
||||
//TODO: configure this in lua
|
||||
g_window.setMouseCursor("/images/cursors/targetcursor", Point(9, 9));
|
||||
m_cursorChanged = true;
|
||||
}
|
||||
|
||||
void Mouse::setHorizontalCursor()
|
||||
{
|
||||
g_window.setMouseCursor("/cursors/horizontal.png", Point(9, 4));
|
||||
g_window.setMouseCursor("/images/cursors/horizontal", Point(9, 4));
|
||||
m_cursorChanged = true;
|
||||
}
|
||||
|
||||
void Mouse::setVerticalCursor()
|
||||
{
|
||||
g_window.setMouseCursor("/cursors/vertical.png", Point(4, 9));
|
||||
g_window.setMouseCursor("/images/cursors/vertical", Point(4, 9));
|
||||
m_cursorChanged = true;
|
||||
}
|
||||
|
||||
void Mouse::setTextCursor()
|
||||
{
|
||||
g_window.setMouseCursor("/cursors/text.png", Point(4, 9));
|
||||
g_window.setMouseCursor("/images/cursors/text", Point(4, 9));
|
||||
m_cursorChanged = true;
|
||||
}
|
||||
|
||||
|
@@ -57,6 +57,8 @@ void UITextEdit::drawSelf(Fw::DrawPane drawPane)
|
||||
|
||||
int textLength = m_text.length();
|
||||
const TexturePtr& texture = m_font->getTexture();
|
||||
if(!texture)
|
||||
return;
|
||||
|
||||
g_painter->setColor(m_color);
|
||||
for(int i=0;i<textLength;++i)
|
||||
|
@@ -92,7 +92,9 @@ void UIWidget::drawText(const Rect& screenCoords)
|
||||
}
|
||||
|
||||
g_painter->setColor(m_color);
|
||||
g_painter->drawTextureCoords(m_textCoordsBuffer, m_font->getTexture());
|
||||
|
||||
if(m_font->getTexture())
|
||||
g_painter->drawTextureCoords(m_textCoordsBuffer, m_font->getTexture());
|
||||
}
|
||||
|
||||
void UIWidget::onTextChange(const std::string& text, const std::string& oldText)
|
||||
|
Reference in New Issue
Block a user