mantarimay
/
Aegisub
forked from mia/Aegisub
1
0
Fork 0
Code Pull Requests Activity

Rows colliding with the currently active one will now be highlighted in grid 

Originally committed to SVN as r86.
This commit is contained in:
Rodrigo Braz Monteiro 2006-02-20 22:54:23 +00:00
parent 8ece0ea54f
commit fd728e90d5
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/base_grid.cpp
View File

@ -281,17 +281,17 @@ void BaseGrid::DrawImage(wxDC &dc) {
// Row colors
std::vector<wxBrush> rowColors;
std::vector<wxBrush> foreColors;
std::vector<wxColor> foreColors;
rowColors.push_back(wxBrush(wxColour(255,255,255))); // 0 = Standard
foreColors.push_back(wxBrush(wxColour(0,0,0)));
foreColors.push_back(wxColour(0,0,0));
rowColors.push_back(wxBrush(wxColour(165,207,231))); // 1 = Header
foreColors.push_back(wxBrush(wxColour(0,0,0)));
foreColors.push_back(wxColour(0,0,0));
rowColors.push_back(wxBrush(Options.AsColour(_T("Grid selection background")))); // 2 = Selected
foreColors.push_back(wxBrush(Options.AsColour(_T("Grid selection foreground"))));
foreColors.push_back(Options.AsColour(_T("Grid selection foreground")));
rowColors.push_back(wxBrush(Options.AsColour(_T("Grid comment background")))); // 3 = Commented
foreColors.push_back(wxBrush(Options.AsColour(_T("Grid selection foreground"))));
foreColors.push_back(Options.AsColour(_T("Grid selection foreground")));
rowColors.push_back(wxBrush(Options.AsColour(_T("Grid inframe background")))); // 4 = Video Highlighted
foreColors.push_back(wxBrush(Options.AsColour(_T("Grid selection foreground"))));
foreColors.push_back(Options.AsColour(_T("Grid selection foreground")));
// First grid row
bool drawGrid = true;
@ -313,6 +313,15 @@ void BaseGrid::DrawImage(wxDC &dc) {
dx = 0;
dy = i*lineHeight;
// Check for collisions
bool collides = false;
if (curDiag) {
AssDialogue *sel = GetDialogue(editBox->linen);
if (sel && sel != curDiag) {
if (curDiag->CollidesWith(sel)) collides = true;
}
}
// Text array
wxArrayString strings;
@ -356,7 +365,7 @@ void BaseGrid::DrawImage(wxDC &dc) {
int mode = Options.AsInt(_T("Grid Hide Overrides"));
wxString value = _T("");
// Hid overrides
// Hidden overrides
if (mode == 1 || mode == 2) {
wxString replaceWith = Options.AsText(_T("Grid hide overrides char"));
curDiag->ParseASSTags();
@ -399,6 +408,12 @@ void BaseGrid::DrawImage(wxDC &dc) {
dc.DrawRectangle((curColor == 1) ? 0 : colWidth[0],i*lineHeight+1,w,lineHeight);
}
// Set text color
if (collides) dc.SetTextForeground(wxColour(255,0,0));
else {
dc.SetTextForeground(foreColors[curColor]);
}
// Draw text
wxRect cur;
bool isCenter;
@ -417,6 +432,7 @@ void BaseGrid::DrawImage(wxDC &dc) {
dc.DrawLabel(strings[j],cur,isCenter ? wxALIGN_CENTER : (wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT));
dx += colWidth[j];
}
//if (collides) dc.SetPen(wxPen(wxColour(255,0,0)));
// Draw grid
dc.DestroyClippingRegion();

1
core/changelog.txt
View File

@ -34,6 +34,7 @@ Please visit http://aegisub.net to download latest version
- Alt+Left/Right on the video seek bar will now seek by increments of 10 frames (increment is customizeable in config.dat) (AMZ)
- Added a simple audio resync method for video playback (AMZ)
- Audio timing will now apply to all selected lines, as well as active line (AMZ)
- Rows colliding with the currently active one will now be highlighted in grid (AMZ)
= 1.09 beta - 2006.01.16 ===========================

4
core/subs_grid.cpp
View File

@ -106,10 +106,6 @@ SubtitlesGrid::SubtitlesGrid(FrameMain* parentFr, wxWindow *parent, wxWindowID i
int w,h;
dc.GetTextExtent(_T("#TWFfgGhH"), &w, &h, NULL, NULL, &font);
RowHeight = h+4;
// Set up
//SetSelectionBackground(Options.AsColour(_T("Grid selection background")));
//SetSelectionForeground(Options.AsColour(_T("Grid selection foreground")));
}