Commits (2)
# Gambas Project File 3.0
Title=Common controls and classes for GUI components
Startup=TestMessage
Startup=FTestSplit
Icon=.hidden/window.png
Version=3.16.90
VersionFile=1
......@@ -8,7 +8,7 @@ Component=gb.image
Component=gb.gui
Component=gb.settings
Arguments=[["-style=oxygen"],["-style=qtcurve"]]
Environment="GB_JIT_DEBUG=1\nGB_GUI=gb.qt5\nLIBOVERLAY_SCROLLBAR=0\n GTK_DEBUG=interactive"
Environment="GB_JIT_DEBUG=1\nGB_GUI=gb.gtk3\nLIBOVERLAY_SCROLLBAR=0\n GTK_DEBUG=interactive"
TabSize=2
Translate=1
Language=en
......
......@@ -385,7 +385,7 @@ Public Sub Resize_MouseMove()
If $bVertical Then
X = Min(Max(Mouse.ScreenY, $XMin + $iMinSize), $XMax - $iMinSize)
X = Min(Max(Mouse.ScreenY + SW - Mouse.StartY, $XMin + $iMinSize), $XMax - $iMinSize)
aChildren[I].H = X - $XMin - SW
aChildren[I + 1].Move(0, X - Me.ScreenY, Me.W, $XMax - X - SW)
......@@ -400,7 +400,7 @@ Public Sub Resize_MouseMove()
Else
X = Min(Max(Mouse.ScreenX, $XMin + $iMinSize), $XMax - $iMinSize)
X = Min(Max(Mouse.ScreenX + SW - Mouse.StartX, $XMin + $iMinSize), $XMax - $iMinSize)
If System.RightToLeft Then
I2 = I
......
......@@ -1035,18 +1035,11 @@ void gControl::updateCursor(GdkCursor *cursor)
{
if (GDK_IS_WINDOW(gtk_widget_get_window(border)) && _inside)
{
#if DEBUG_ENTER_LEAVE
fprintf(stderr, "updateCursor: %s %p\n", name(), cursor);
#endif
if (!cursor && parent() && gtk_widget_get_window(parent()->border) == gtk_widget_get_window(border))
parent()->updateCursor(parent()->getGdkCursor());
else
{
#if DEBUG_ENTER_LEAVE
fprintf(stderr, "updateCursor: gdk_window_set_cursor: window = %p\n", gtk_widget_get_window(border));
#endif
if (cursor || isWindow())
gdk_window_set_cursor(gtk_widget_get_window(border), cursor);
}
if (!cursor && parent())
parent()->updateCursor(parent()->getGdkCursor());
}
}
......
......@@ -324,7 +324,7 @@ public:
void realizeScrolledWindow(GtkWidget *wid, bool doNotRealize = false);
void registerControl();
void updateGeometry(bool force = false);
bool mustUpdateCursor() { return mouse() != -1 || have_cursor; }
bool mustUpdateCursor() { return mouse() != -1 || have_cursor || !parent(); }
bool hasInputMethod() { return _has_input_method; }
virtual GtkIMContext *getInputMethod();
......