summaryrefslogtreecommitdiff
path: root/src/corelib
diff options
context:
space:
mode:
authorgraemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf>2007-09-08 13:49:40 +0000
committergraemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf>2007-09-08 13:49:40 +0000
commite6d2ec50bb37d5b92703e1852b814c90dd4d3204 (patch)
tree4b280d5b8b8f8b4a2c475ed84ef6a07ef7581246 /src/corelib
parent8c2cd0a27d852f4b02ca07850a2fbaf9cec05368 (diff)
downloadfpGUI-e6d2ec50bb37d5b92703e1852b814c90dd4d3204.tar.xz
* Fixed initial painting of components when they are placed in the
form designer. * Fixed the initial state of scrollbars for various components. * Implemented more fine grained cursors. Used by the designer for the resizer buttons. * Components can now be moved around in the designer form. * Components can now be placed inside container components like TfpgBevel. * Treeview doesn't crash the GUI designer anymore, yet the painting is still not working for it. * Tab and reverse Tab now work in the GUI designer. * GUI Designer title bar is now consistent in text format.
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/gdi/gfx_gdi.pas12
-rw-r--r--src/corelib/gfx_widget.pas1
-rw-r--r--src/corelib/gfxbase.pas2
-rw-r--r--src/corelib/x11/gfx_x11.pas8
4 files changed, 17 insertions, 6 deletions
diff --git a/src/corelib/gdi/gfx_gdi.pas b/src/corelib/gdi/gfx_gdi.pas
index 42107f47..17a3fe3e 100644
--- a/src/corelib/gdi/gfx_gdi.pas
+++ b/src/corelib/gdi/gfx_gdi.pas
@@ -163,6 +163,8 @@ type
hcr_edit: HCURSOR;
hcr_dir_nwse: HCURSOR;
hcr_dir_nesw: HCURSOR;
+// hcr_dir_senw: HCURSOR;
+// hcr_dir_swne: HCURSOR;
hcr_move: HCURSOR;
hcr_crosshair: HCURSOR;
hcr_wait: HCURSOR;
@@ -737,6 +739,8 @@ begin
hcr_edit := LoadCursor(0, IDC_IBEAM);
hcr_dir_nwse := LoadCursor(0, IDC_SIZENWSE);
hcr_dir_nesw := LoadCursor(0, IDC_SIZENESW);
+// hcr_dir_senw := LoadCursor(0, IDC_SIZENWSE);
+// hcr_dir_swne := LoadCursor(0, IDC_SIZENESW);
hcr_move := LoadCursor(0, IDC_SIZEALL);
hcr_crosshair := LoadCursor(0, IDC_CROSS);
hcr_wait := LoadCursor(0, IDC_WAIT);
@@ -1063,8 +1067,12 @@ begin
mcSizeEW: hc := wapplication.hcr_dir_ew;
mcSizeNS: hc := wapplication.hcr_dir_ns;
mcIBeam: hc := wapplication.hcr_edit;
- mcSizeNWSE: hc := wapplication.hcr_dir_nwse;
- mcSizeNESW: hc := wapplication.hcr_dir_nesw;
+ mcSizeNWSE,
+ mcSizeSENW: hc := wapplication.hcr_dir_nwse;
+ mcSizeNESW,
+ mcSizeSWNE: hc := wapplication.hcr_dir_nesw;
+// mcSizeSWNE: hc := wapplication.hcr_dir_swne;
+// mcSizeSENW: hc := wapplication.hcr_dir_senw;
mcMove: hc := wapplication.hcr_move;
mcCross: hc := wapplication.hcr_crosshair;
mcHourGlass: hc := wapplication.hcr_wait;
diff --git a/src/corelib/gfx_widget.pas b/src/corelib/gfx_widget.pas
index 7637deb7..15715769 100644
--- a/src/corelib/gfx_widget.pas
+++ b/src/corelib/gfx_widget.pas
@@ -315,6 +315,7 @@ var
begin
if FFormDesigner <> nil then
begin
+// writeln('dispatching message to designer...');
FFormDesigner.Dispatch(msg);
Exit;
end;
diff --git a/src/corelib/gfxbase.pas b/src/corelib/gfxbase.pas
index 7b26daf0..a45c5632 100644
--- a/src/corelib/gfxbase.pas
+++ b/src/corelib/gfxbase.pas
@@ -25,7 +25,7 @@ type
TWindowAttributes = set of TWindowAttribute;
TMouseCursor = (mcDefault, mcArrow, mcCross, mcIBeam, mcSizeEW, mcSizeNS,
- mcSizeNWSE, mcSizeNESW, mcMove, mcHourGlass);
+ mcSizeNWSE, mcSizeNESW, mcSizeSWNE, mcSizeSENW, mcMove, mcHourGlass);
TGradientDirection = (gdVertical, // Fill vertical
gdHorizontal); // Fill Horizontal
diff --git a/src/corelib/x11/gfx_x11.pas b/src/corelib/x11/gfx_x11.pas
index aa3b36a9..d27a834c 100644
--- a/src/corelib/x11/gfx_x11.pas
+++ b/src/corelib/x11/gfx_x11.pas
@@ -1169,9 +1169,11 @@ begin
mcSizeEW: shape := XC_sb_h_double_arrow;
mcSizeNS: shape := XC_sb_v_double_arrow;
mcIBeam: shape := XC_xterm;
- mcSizeNWSE: shape := XC_sizing;
- mcSizeNESW: shape := XC_sizing; // ????
- mcMove: shape := XC_center_ptr; // ????
+ mcSizeNWSE: shape := XC_bottom_right_corner;
+ mcSizeNESW: shape := XC_bottom_left_corner;
+ mcSizeSWNE: shape := XC_top_right_corner;
+ mcSizeSENW: shape := XC_top_left_corner;
+ mcMove: shape := XC_fleur;
mcCross: shape := XC_crosshair;
mcHourGlass: shape := XC_watch;
else