mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Fix bug where the grid headers sometimes used the collision text color

Browse source 
Originally committed to SVN as r4833.
This commit is contained in:
Thomas Goyne 2010-11-08 02:52:54 +00:00
parent e738847eb2
commit 469bd3e165
1 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
aegisub/src/base_grid.cpp
View file

@ -606,25 +606,12 @@ void BaseGrid::DrawImage(wxDC &dc) {
} }
// Draw rows // Draw rows
int dx = 0;
int dy = 0;
int curColor = 0;
AssDialogue *curDiag;
for (int i=0;i<nDraw+1;i++) { for (int i=0;i<nDraw+1;i++) {
// Prepare // Prepare
int curRow = i+yPos-1; int curRow = i+yPos-1;
curDiag = (curRow>=0) ? GetDialogue(curRow) : NULL; AssDialogue *curDiag = GetDialogue(curRow);
dx = 0; int curColor = 0;
dy = i*lineHeight;
// Check for collisions
bool collides = false; bool collides = false;
if (curDiag) {
AssDialogue *sel = GetActiveLine();
if (sel && sel != curDiag) {
if (curDiag->CollidesWith(sel)) collides = true;
}
}
// Text array // Text array
wxArrayString strings; wxArrayString strings;
@ -701,10 +688,14 @@ void BaseGrid::DrawImage(wxDC &dc) {
else if (inSel) curColor = 2; else if (inSel) curColor = 2;
else if (curDiag->Comment) curColor = 3; else if (curDiag->Comment) curColor = 3;
else if (OPT_GET("Subtitle/Grid/Highlight Subtitles in Frame")->GetBool() && IsDisplayed(curDiag)) curColor = 4; else if (OPT_GET("Subtitle/Grid/Highlight Subtitles in Frame")->GetBool() && IsDisplayed(curDiag)) curColor = 4;
if (active_line != curDiag) {
collides = curDiag->CollidesWith(active_line);
}
} }
else { else {
for (int j=0;j<11;j++) strings.Add(_T("?")); strings.resize(11, L"?");
} }
// Draw row background color // Draw row background color
@ -720,17 +711,17 @@ void BaseGrid::DrawImage(wxDC &dc) {
} }
// Draw text // Draw text
wxRect cur; int dx = 0;
bool isCenter; int dy = i*lineHeight;
for (int j=0;j<11;j++) { for (int j=0;j<11;j++) {
// Check width // Check width
if (colWidth[j] == 0) continue; if (colWidth[j] == 0) continue;
// Is center? // Is center?
isCenter = !(j == 4 || j == 5 || j == 6 || j == 10); bool isCenter = !(j == 4 || j == 5 || j == 6 || j == 10);
// Calculate clipping // Calculate clipping
cur = wxRect(dx+4,dy,colWidth[j]-6,lineHeight); wxRect cur(dx+4,dy,colWidth[j]-6,lineHeight);
// Set clipping // Set clipping
dc.DestroyClippingRegion(); dc.DestroyClippingRegion();
@ -740,7 +731,6 @@ void BaseGrid::DrawImage(wxDC &dc) {
dc.DrawLabel(strings[j],cur,isCenter ? wxALIGN_CENTER : (wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT)); dc.DrawLabel(strings[j],cur,isCenter ? wxALIGN_CENTER : (wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT));
dx += colWidth[j]; dx += colWidth[j];
} }
//if (collides) dc.SetPen(wxPen(wxColour(255,0,0)));
// Draw grid // Draw grid
dc.DestroyClippingRegion(); dc.DestroyClippingRegion();
@ -752,8 +742,8 @@ void BaseGrid::DrawImage(wxDC &dc) {
} }
// Draw grid columns // Draw grid columns
dx = 0;
if (drawGrid) { if (drawGrid) {
int dx = 0;
dc.SetPen(wxPen(lagi_wxColour(OPT_GET("Colour/Subtitle Grid/Lines")->GetColour()))); dc.SetPen(wxPen(lagi_wxColour(OPT_GET("Colour/Subtitle Grid/Lines")->GetColour())));
for (int i=0;i<10;i++) { for (int i=0;i<10;i++) {
dx += colWidth[i]; dx += colWidth[i];
@ -767,7 +757,7 @@ void BaseGrid::DrawImage(wxDC &dc) {
if (GetActiveLine()) { if (GetActiveLine()) {
dc.SetPen(wxPen(lagi_wxColour(OPT_GET("Colour/Subtitle Grid/Active Border")->GetColour()))); dc.SetPen(wxPen(lagi_wxColour(OPT_GET("Colour/Subtitle Grid/Active Border")->GetColour())));
dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.SetBrush(*wxTRANSPARENT_BRUSH);
dy = (line_index_map[GetActiveLine()]+1-yPos) * lineHeight; int dy = (line_index_map[GetActiveLine()]+1-yPos) * lineHeight;
dc.DrawRectangle(0,dy,w,lineHeight+1); dc.DrawRectangle(0,dy,w,lineHeight+1);
} }
} }