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

Fixed colors for labels for "TopActivity".

Browse source 
Для Linux цвета всплывающих подсказок были некорректны.
Сейчас цвета шрифта и фона беруться из настрок ОС.
This commit is contained in:
lsv 2025-12-08 09:47:03 +05:00
parent 9e792fb0f1
commit 899e3530f5
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
ctl/wxTopActivity.cpp
View file

@ -696,11 +696,11 @@ void wxTopActivity::render(wxDC& dc)
std::map<int, int> pid_btype; std::map<int, int> pid_btype;
// quid -> idx // quid -> idx
// быстрый поиск // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
//std::map<long long,int> map_qid_idx; //std::map<long long,int> map_qid_idx;
std::vector<long long> qid_; std::vector<long long> qid_;
//std::vector<int> qid_wait_id; //std::vector<int> qid_wait_id;
// сумма ожидания для каждого idx // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> idx
std::vector<std::vector<int>> qid_wait_id_SUM; std::vector<std::vector<int>> qid_wait_id_SUM;
//std::vector<std::vector<int>> qid_wait_id; //std::vector<std::vector<int>> qid_wait_id;
std::vector<int> sum_bg(m_count_wait); std::vector<int> sum_bg(m_count_wait);
@ -1044,6 +1044,8 @@ void wxTopActivity::paintSelRange(wxDC& dc, int width_sample) {
{ {
// current vert line // current vert line
if (m_area.Contains(p2) && m_area.Contains(p1) && t.IsValid()) { if (m_area.Contains(p2) && m_area.Contains(p1) && t.IsValid()) {
wxDCTextBgColourChanger bb(dc,wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK));
wxDCTextColourChanger ff(dc,wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT));
dc.SetBrush(bgCol); dc.SetBrush(bgCol);
dc.SetPen(*wxBLACK); dc.SetPen(*wxBLACK);
dc.DrawRectangle(r); dc.DrawRectangle(r);
@ -1059,6 +1061,9 @@ void wxTopActivity::paintSelRange(wxDC& dc, int width_sample) {
// arrow line // arrow line
wxPoint points[3]; wxPoint points[3];
if (fix_pos_L.IsValid() && (dx2 < dx1)) { if (fix_pos_L.IsValid() && (dx2 < dx1)) {
wxDCTextBgColourChanger bb(dc,wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK));
wxDCTextColourChanger ff(dc,wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT));
wxString labelLeft = fix_pos_L.Format("%d %H:%M:%S"); wxString labelLeft = fix_pos_L.Format("%d %H:%M:%S");
wxSize szf = dc.GetTextExtent(labelLeft); wxSize szf = dc.GetTextExtent(labelLeft);
wxPoint p1(cx - dx1, m_area.y + 25); wxPoint p1(cx - dx1, m_area.y + 25);
@ -1277,12 +1282,12 @@ void wxTopActivity::setViewRange(int m_aggregate_interval, int RightTime) {
m_RightTime = RightTime; m_RightTime = RightTime;
} }
/// <summary> /// <summary>
/// Получение объекта WaitSample и некоторых настроечных параметров. /// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> WaitSample <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
/// ///
/// </summary> /// </summary>
/// <param name="m_aggregate_interval"> Переменная в которую записывается текущий агрегатный период</param> /// <param name="m_aggregate_interval"> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD></param>
/// <param name="RightTime"> Перменная в которую записывается текущая правая граница</param> /// <param name="RightTime"> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></param>
/// <returns> Возвращает адрес WaitSample объекта</returns> /// <returns> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> WaitSample <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></returns>
WaitSample* wxTopActivity::getViewRange(int& m_aggregate_interval, int& RightTime) { WaitSample* wxTopActivity::getViewRange(int& m_aggregate_interval, int& RightTime) {
m_aggregate_interval = m_agg_int; m_aggregate_interval = m_agg_int;
@ -1679,7 +1684,7 @@ void wxCustomButton::render(wxDC& dc)
y = y - h; y = y - h;
} }
x = x - widthLine; x = x - widthLine;
int skip = (prev_t - sa.etime) / interval; // не было ожиданий int skip = (prev_t - sa.etime) / interval; // <EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
if (skip > 0) { if (skip > 0) {
x -= skip * widthLine; x -= skip * widthLine;
} }