Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed size of the log dialog details drop down

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-02-04 19:15:35 +00:00
parent c89f5c02b1
commit 9f14a81890
1 changed files with 50 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/generic/logg.cpp
View File

@@ -809,15 +809,17 @@ void wxLogDialog::CreateDetailsControls()
{ {
wxBitmap bmp = wxTheApp->GetStdIcon(icons[icon]); wxBitmap bmp = wxTheApp->GetStdIcon(icons[icon]);
// This may very well fail if there are insufficient // This may very well fail if there are insufficient colours available.
// colours available. Degrade gracefully. // Degrade gracefully.
if ( !bmp.Ok() )
if (!bmp.Ok()) {
loadedIcons = FALSE; loadedIcons = FALSE;
else
imageList->Add(wxImage(bmp). break;
Rescale(ICON_SIZE, ICON_SIZE). }
ConvertToBitmap());
wxImage img(bmp);
imageList->Add(img.Rescale(ICON_SIZE, ICON_SIZE).ConvertToBitmap());
} }
m_listctrl->SetImageList(imageList, wxIMAGE_LIST_SMALL); m_listctrl->SetImageList(imageList, wxIMAGE_LIST_SMALL);
@@ -834,52 +836,52 @@ void wxLogDialog::CreateDetailsControls()
size_t count = m_messages.GetCount(); size_t count = m_messages.GetCount();
for ( size_t n = 0; n < count; n++ ) for ( size_t n = 0; n < count; n++ )
{ {
int image = -1; int image;
#ifndef __WIN16__ #ifndef __WIN16__
switch ( m_severity[n] ) if ( loadedIcons )
{ {
case wxLOG_Error: switch ( m_severity[n] )
image = 0; {
break; case wxLOG_Error:
image = 0;
break;
case wxLOG_Warning: case wxLOG_Warning:
image = 1; image = 1;
break; break;
default: default:
image = 2; image = 2;
}
} }
else // failed to load images
#endif // !Win16 #endif // !Win16
{
if (!loadedIcons)
image = -1; image = -1;
}
if (image > -1) m_listctrl->InsertItem(n, m_messages[n], image);
m_listctrl->InsertItem(n, m_messages[n], image); m_listctrl->SetItem(n, 1, TimeStamp(fmt, (time_t)m_times[n]));
else
m_listctrl->InsertItem(n, m_messages[n]);
m_listctrl->SetItem(n, 1,
TimeStamp(fmt, (time_t)m_times[n]));
} }
// let the columns size themselves // let the columns size themselves
m_listctrl->SetColumnWidth(0, wxLIST_AUTOSIZE); m_listctrl->SetColumnWidth(0, wxLIST_AUTOSIZE);
m_listctrl->SetColumnWidth(1, wxLIST_AUTOSIZE); m_listctrl->SetColumnWidth(1, wxLIST_AUTOSIZE);
// get the approx height of the listctrl // calculate an approximately nice height for the listctrl
wxFont font = GetFont(); int height = GetCharHeight()*(count + 2);
if ( !font.Ok() )
font = *wxSWISS_FONT;
int y; // but check that the dialog won't fall fown from the screen
GetTextExtent(_T("H"), (int*)NULL, &y, (int*)NULL, (int*)NULL, &font); //
int height = wxMax(y*(count + 3), 100); // we use GetMinHeight() to get the height of the dialog part without the
// details and we consider that the "Save" button below and the separator
// line (and the margins around it) take about as much, hence double it
int heightMax = wxGetDisplaySize().y - GetPosition().y - 2*GetMinHeight();
// if the height as computed from list items exceeds, together with the // we should leave a margin
// actual message & controls, the screen, make it smaller heightMax *= 9;
int heightMax = heightMax /= 10;
(3*wxSystemSettings::GetMetric(wxSYS_SCREEN_Y))/5 - GetSize().y;
m_listctrl->SetSize(-1, wxMin(height, heightMax)); m_listctrl->SetSize(-1, wxMin(height, heightMax));
} }
@@ -936,7 +938,7 @@ void wxLogDialog::OnSave(wxCommandEvent& WXUNUSED(event))
if ( !ok ) if ( !ok )
wxLogError(_("Can't save log contents to file.")); wxLogError(_("Can't save log contents to file."));
#endif #endif // wxUSE_FILEDLG
} }
#endif // wxUSE_FILE #endif // wxUSE_FILE
@@ -974,6 +976,15 @@ void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
sizer->Add(m_listctrl, 1, wxEXPAND | (wxALL & ~wxTOP), MARGIN); sizer->Add(m_listctrl, 1, wxEXPAND | (wxALL & ~wxTOP), MARGIN);
// VZ: this doesn't work as this becomes the initial (and not only
// minimal) listctrl height as well - why?
#if 0
// allow the user to make the dialog shorter than its initial height -
// without this it wouldn't work as the list ctrl would have been
// incompressible
sizer->SetItemMinSize(m_listctrl, 100, 3*GetCharHeight());
#endif // 0
#if wxUSE_FILE #if wxUSE_FILE
sizer->Add(m_btnSave, 0, wxALIGN_RIGHT | (wxALL & ~wxTOP), MARGIN); sizer->Add(m_btnSave, 0, wxALIGN_RIGHT | (wxALL & ~wxTOP), MARGIN);
#endif // wxUSE_FILE #endif // wxUSE_FILE