games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-17 01:32:21 +02:00
Code Issues Releases Activity

minors:

Browse Source 
- fixes missing line of pixels with Chinese fonts
- disabling a mod won't disable all its requirements as well
This commit is contained in:
Ivan Savenko
2013-09-08 18:35:09 +00:00
parent 99352a7220
commit 6331995afd
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/gui/CIntObjectClasses.cpp
View File

@ -1284,7 +1284,7 @@ void CTextContainer::blitLine(SDL_Surface *to, Rect destRect, std::string what)
f->renderTextLeft(to, toPrint, color, where); f->renderTextLeft(to, toPrint, color, where);
begin = end; begin = end;
destRect.x += f->getStringWidth(toPrint); where.x += f->getStringWidth(toPrint);
} }
currDelimeter++; currDelimeter++;
} }

4
client/gui/Fonts.cpp
View File

@ -313,11 +313,11 @@ void CBitmapHanFont::renderCharacter(SDL_Surface * surface, int characterIndex,
// start of line, may differ from 0 due to end of surface or clipped surface // start of line, may differ from 0 due to end of surface or clipped surface
int lineBegin = std::max<int>(0, clipRect.y - posY); int lineBegin = std::max<int>(0, clipRect.y - posY);
int lineEnd = std::min<int>(size, clipRect.y + clipRect.h - posY - 1); int lineEnd = std::min<int>(size, clipRect.y + clipRect.h - posY);
// start end end of each row, may differ from 0 // start end end of each row, may differ from 0
int rowBegin = std::max<int>(0, clipRect.x - posX); int rowBegin = std::max<int>(0, clipRect.x - posX);
int rowEnd = std::min<int>(size, clipRect.x + clipRect.w - posX - 1); int rowEnd = std::min<int>(size, clipRect.x + clipRect.w - posX);
//for each line in symbol //for each line in symbol
for(int dy = lineBegin; dy <lineEnd; dy++) for(int dy = lineBegin; dy <lineEnd; dy++)

8
launcher/modManager/cmodlistview_moc.cpp
View File

@ -351,10 +351,10 @@ void CModListView::on_disableButton_clicked()
{ {
QString modName = modModel->modIndexToName(filterModel->mapToSource(ui->allModsView->currentIndex()).row()); QString modName = modModel->modIndexToName(filterModel->mapToSource(ui->allModsView->currentIndex()).row());
for (auto & name : modModel->getRequirements(modName)) if (modModel->hasMod(modName) &&
if (modModel->hasMod(name) && modModel->getMod(modName).isEnabled())
modModel->getMod(name).isEnabled()) manager->disableMod(modName);
manager->disableMod(name);
checkManagerErrors(); checkManagerErrors();
} }