github-starred/pgadmin3
2
0
Fork 0
mirror of https://github.com/levinsv/pgadmin3.git synced 2026-05-15 06:05:49 -06:00
Code Issues 6 Projects Packages Wiki Activity Actions

Optimization for linux.

Browse source 
Исправлено форматирование и учтены особенности GTK для корректного
отображения Log View.
This commit is contained in:
lsv 2025-03-27 10:13:11 +05:00 • committed by lsv
parent dd868d51fd
commit 5aeb93b625
3 changed files with 1517 additions and 1489 deletions
Download patch file Download diff file Expand all files Collapse all files

1066
ctl/explainShape.cpp
View file

File diff suppressed because it is too large Load diff

1907
frm/frmLog.cpp
View file

File diff suppressed because it is too large Load diff

33
utils/log/StorageModel.cpp
View file

@ -36,6 +36,7 @@ public:
Storage* st; Storage* st;
int row; int row;
int countRows = 0; int countRows = 0;
wxColour quoteselcolor;
// This renderer can be either activatable or editable, for demonstration // This renderer can be either activatable or editable, for demonstration
// purposes. In real programs, you should select whether the user should be // purposes. In real programs, you should select whether the user should be
// able to activate or edit the cell and it doesn't make sense to switch // able to activate or edit the cell and it doesn't make sense to switch
@ -46,12 +47,25 @@ public:
EnableEllipsize(wxELLIPSIZE_END); EnableEllipsize(wxELLIPSIZE_END);
col = column; col = column;
st = NULL; st = NULL;
wxColour textColour;
#ifdef __WXGTK__
textColour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
#else
textColour = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXTEXT);
#endif // __WXGTK__
if (ContrastColorBlackOrWhite(textColour) == "#000000") {
quoteselcolor = wxColour(wxString("#7f7f7f"));
}
else quoteselcolor = *wxYELLOW;
} }
virtual bool Render(wxRect rect, wxDC* dc, int state) wxOVERRIDE virtual bool Render(wxRect rect, wxDC* dc, int state) wxOVERRIDE
{ {
//dc->SetBrush( *wxLIGHT_GREY_BRUSH ); //dc->SetBrush( *wxLIGHT_GREY_BRUSH );
dc->SetBrush(*wxYELLOW_BRUSH); if (state & wxDATAVIEW_CELL_SELECTED)
dc->SetBrush(quoteselcolor);
else
dc->SetBrush(*wxYELLOW_BRUSH);
dc->SetPen(*wxTRANSPARENT_PEN); dc->SetPen(*wxTRANSPARENT_PEN);
rect.Deflate(2); rect.Deflate(2);
wxRect orig = rect; wxRect orig = rect;
@ -71,7 +85,6 @@ public:
int startX = 0; int startX = 0;
wxRect rectCol; wxRect rectCol;
while (i < s.Len()) { while (i < s.Len()) {
t = ""; t = "";
@ -105,16 +118,12 @@ public:
t += s[i]; t += s[i];
i++; i++;
} }
RenderText(t, RenderText(t, x, rect, dc, state);
x, // no offset
//wxRect(dc->GetTextExtent(m_value)).CentreIn(rect),
rect,
dc,
state);
rect.y = rect.y + h.GetHeight() + 0; rect.y = rect.y + h.GetHeight() + 0;
rect.height = rect.height - (h.GetHeight() + 0); rect.height = rect.height - (h.GetHeight() + 0);
ex = true;
} }
if (!ex) RenderText(t, x, rect, dc, state);
if (countRows > 0 && col == StorageModel::cols::Col_Host) { if (countRows > 0 && col == StorageModel::cols::Col_Host) {
dc->SetBrush(*wxGREEN_BRUSH); dc->SetBrush(*wxGREEN_BRUSH);
@ -170,8 +179,12 @@ public:
if (lines > 1) { if (lines > 1) {
wxString position; wxString position;
position = wxString::Format("lines %d,hieght 1 row %d full h=%d", lines, txtSize.GetHeight(), txtSize.GetHeight() * lines + 1 * lines); position = wxString::Format("lines %d,hieght 1 row %d full h=%d", lines, txtSize.GetHeight(), txtSize.GetHeight() * lines + 1 * lines);
// wxLogMessage("MyCustomRendererText GetSize() %s", position); #ifdef __WXGTK__
wxSize charSize = GetTextExtent("H");
txtSize.SetHeight(txtSize.GetHeight() + charSize.GetHeight()/2);
#else
txtSize.SetHeight(txtSize.GetHeight() * lines + 1 * lines); txtSize.SetHeight(txtSize.GetHeight() * lines + 1 * lines);
#endif
} }
else else
txtSize.SetHeight(-1); txtSize.SetHeight(-1);