diff --git a/uppsrc/CtrlCore/GtkCreate.cpp b/uppsrc/CtrlCore/GtkCreate.cpp index 3917232ce..1541f16ab 100644 --- a/uppsrc/CtrlCore/GtkCreate.cpp +++ b/uppsrc/CtrlCore/GtkCreate.cpp @@ -75,7 +75,7 @@ void Ctrl::Create(Ctrl *owner, bool popup) FocusSync(); if(!popup) SetWndFocus(); - + SweepConfigure(true); DndInit(); diff --git a/uppsrc/CtrlCore/GtkEvent.cpp b/uppsrc/CtrlCore/GtkEvent.cpp index 96498060d..3aa44770c 100644 --- a/uppsrc/CtrlCore/GtkEvent.cpp +++ b/uppsrc/CtrlCore/GtkEvent.cpp @@ -4,8 +4,8 @@ namespace Upp { -#define LLOG(x) // DLOG(rmsecs() << ' ' << x) -// #define LOG_EVENTS _DBG_ +#define LLOG(x) // DLOG(x) +#define LOG_EVENTS // _DBG_ BiVector Ctrl::Events; @@ -370,7 +370,7 @@ void Ctrl::Proc() Tuple2 *f = FindTuple(xEvent, __countof(xEvent), CurrentEvent.type); if(f) ev = f->b; - LOG(rmsecs() << " PROCESS EVENT " << Upp::Name(this) << " " << ev); + LOG("> PROCESS EVENT " << Upp::Name(this) << " " << ev); ProcStop tm; tm.ev = ev; #endif @@ -381,10 +381,9 @@ void Ctrl::Proc() int kv, hw; static int clicktime = msecs() - 100000; switch(CurrentEvent.type) { - case GDK_MOTION_NOTIFY: { + case GDK_MOTION_NOTIFY: GtkMouseEvent(MOUSEMOVE, MOUSEMOVE, 0); break; - } case GDK_BUTTON_PRESS: if(!HasWndFocus() && !popup) SetWndFocus(); diff --git a/uppsrc/CtrlCore/GtkWnd.cpp b/uppsrc/CtrlCore/GtkWnd.cpp index 7b5b15806..e0c98103a 100644 --- a/uppsrc/CtrlCore/GtkWnd.cpp +++ b/uppsrc/CtrlCore/GtkWnd.cpp @@ -452,12 +452,7 @@ void Ctrl::WndSetPos(const Rect& rect) if(dynamic_cast(this)) m = GetFrameMargins(); gdk_window_move_resize(gdk(), LSC(rect.left - m.left), LSC(rect.top - m.top), LSC(rect.GetWidth()), LSC(rect.GetHeight())); - int t0 = msecs(); - do { // Wait up to 500ms for corresponding GDK_CONFIGURE to arrive - if(SweepConfigure(true)) - break; - } - while(msecs() - t0 < 500); + SetWndRect(rect); LLOG("-- WndSetPos0 " << rect << " " << msecs() - t0); } diff --git a/uppsrc/CtrlCore/gtk3-todo.txt b/uppsrc/CtrlCore/gtk3-todo.txt index 5121fe5d5..9ec0aeece 100644 --- a/uppsrc/CtrlCore/gtk3-todo.txt +++ b/uppsrc/CtrlCore/gtk3-todo.txt @@ -4,12 +4,13 @@ - LeftRoundness with DropChoice (DropChoiceRdO) - disabled color in Breeze-Dark - DarkCold: problem slight problem with scrollbars -- PopupInfo issue -- FileSel icons for Video etc +- Pushbutton push does not look nice +- ColumnList selected item background (Mint-X) NTH: - spinbutton cosmetics - Redmond scrollbars width +- Improve scrollbars borders PROBABLY DONE: - Problem with hot3 in scrollbar horizontal (check in SD) @@ -61,3 +62,5 @@ DONE: - tooltip issue - test DateTimeCtrl in dark mode - 3.8 theme +- PopupInfo issue +- FileSel icons for Video etc diff --git a/uppsrc/CtrlLib/FileSel.cpp b/uppsrc/CtrlLib/FileSel.cpp index 79d5eba7a..672010586 100644 --- a/uppsrc/CtrlLib/FileSel.cpp +++ b/uppsrc/CtrlLib/FileSel.cpp @@ -92,7 +92,7 @@ Image GnomeImage(const char *s, bool large = false) Image SystemImage(const char *s, bool large = false) { - return GtkThemeIcon(s, large); + return GtkThemeIcon(s, DPI(large ? 48 : 16)); } struct ExtToMime {