Show
Ignore:
Timestamp:
08/27/08 15:47:18 (4 months ago)
Author:
magi@…
Message:

Mass merge from trunk to 5.2 branch:
Merged [4911]: Initial commit for #1739, implements Table.addGeneratedColumn()
Merged [4914]: The order of the headers was not updated in some instances.
Merged [4996]: Integrated patch from ticket #1857. Closes the ticket.
Merged [5006]: Marked MenuBar? and MenuBarItem? copied from GWT as deprecated. They are old implementations and should not be used by anyone. They are only used by IFilterSelect.SuggestionMenu?. This class should be reimplemented in future any ways.
Merged [5012]: Fixes #1841 (streched, pixellated buttons in IE)
Merged [5014]: Fix for #1841 (streched, pixellated buttons in IE); width:1px in IE6 so that the button does not take up too much space.
Merged [5020]: Fixes #1841 (streched buttons in IE).
Merged [5021]: Fixes the main problem in #1867, but brings other problems. Needs more work.
Merged [5022]: Removed width calculation from iLayout(): it caused #1757, and we were unable to come up a case that needed the code. Fixes #1757.
Merged [5023]: Fixes #1896 Error (!) mark missing from button and checkbox on IE
Merged [5024]: Removed JDK 1.5 dependencies from a fix (is Form.java) that is targeted to 5.2.x
Merged [5030]: Fixed #1867 further.
Merged [5031]: Fixed: if Panel's width changes from some other value to 100%, the result won't be as expected.
Merged [5033]: Corrections for #1867
Merged [5036]: "Final" Fix for #1867
Merged [5038]: Fixes ticket #1867 (Error message in Form is empty if required field is empty)
Merged [5039]: Removed unneeded hasErrorMessageClass() method left over from #1867.
Merged [5050]: Implemented equals on margininfo
Merged [5052]: Fixes #1906 : Button should provide easy to use method for getting the boolean state of the checkbox
Merged [5053]: booleanValue should be public
Merged [5062]: Fixes #1905: Tooltips for components inside sub-windows we're not shown.
Merged [5068]: No longer selects value as a sideeffect of unfocusing; fixes #1899
Merged [5074]: fixes #1581
Merged [5075]: forgotten changes for #1834
Merged [5076]: Test case and fix for #1924
Merged [5077]: partial fix for #1902. FF seems to bug some pixels still (too narrow).
Merged [5083]: added helper method to clone dom element
Merged [5087]: Fixes FF3 issue with relational widths
Merged [5091]: workaround for #1869 + updated deprecated methods
Merged [5092]: updated ticket number, previous changeset is for #1970
Merged [5097]: Better error message in case the user had not set main window
Merged [5103]: Fixes #1942: DateField? popup button hidden in Tables in editable mode
Merged [5104]: Fixes #1941: Combobox should close the dropdown menu when pressing ESC-key
Merged [5112]: Fixed building widgetsets on mac_leopard platform
Merged [5115]: Fixed a possible security vulnerability in IWindow. The window caption string was not escaped, and any HTML could be passed and parsed inside it.
Merged [5122]: Fixed #1959: SplitPanel? calling setSecondComponent bugs if second component already exists
Merged [5129]: fixes #1960 (IE and disabled datefield) and removes odd usage of ITextField just to get proper style names
Merged [5132]: fixes #18678 (too long captions in panels)
Merged [5138]: fixes #1882 (loading indicator position)
Merged [5139]: cancels events with found key combinations. allows using key combos like "ctrl-s"
Merged [5140]: fixes #1956 (RAW mode in Label)
Merged [5141]: fixes #1963 (support for row icons)
Merged [5142]: fixes #1965 (support for table column icons)
Merged [5145]: fixes #1951 (stylenames in FF)
Merged [5147]: fixes #1733, version information is now printed on clients "DebugConsole?"
Merged [5150]: fixes #1926 (random layout issues with Safari + Splitpanel)
Merged [5155]: Fixed #1953 IGridlayout fails to render rows with colspanned rows properly
Merged [5156]: Fix for invalid css value for textfield width
Merged [5160]: Fix for #1925 Main window caption flashes at wrong charset in the application restart
Merged [5161]: caption and icon setters to Paintable interface, major tabsheet refactoring, client side caption handling for layouts
Merged [5162]: itabsheet fixes
Merged [5163]: itabsheet fix
Merged [5165]: window -> $wnd
Merged [5166]: itabsheet fix
Merged [5167]: itabsheet fix
Merged [5168]: Small fixes to ITabSheet DOM-structure.
Merged [5169]: Fixes new ITabsheet styles.
Merged [5171]: fixes #1737 (Method for components to request whole screen re-layout + imgage embeddeds now using it)
Merged [5173]: fixes #1919 (ISizeableGridLayout margins)
Merged [5174]: sizeable grid layout spacing css
Merged [5175]: Removed annotation
Merged [5176]: fixes #1445 (javadocs)
Merged [5178]: form handles its own caption
Merged [5179]: fixed an issue in gecko - webkit detection
Merged [5181]: added quick workaround for #1980 (IndexedContainer has sluggish equals/hashCode methods)
Merged [5182]: Table: optimizing one extra cache build on container change
Merged [5183]: Optimizing IndexedContainerProperty? hashCode (or making it practical)
Merged [5184]: Optimizing IndexedContainerItem? hashCode (or making it practical)
Merged [5185]: reverted IndexedContainer specific hack (IdentityHashMap? => Set). IndexedContainerProperty? now has a reasonable hasCode
Merged [5186]: removed IndexedContainer.equals + hashCode. fixes #1980 with [5181],[5182],[5183],[5184],[5185]
Merged [5187]: Fixes #1981 (some selections lost when scrolling)
Merged [5188]: ICustomComponent now request caption rendering from layout
Merged [5190]: AbsoluteGridCell?: overflow hidden hack for IE 6 to reduce grid properly (found due #1982)
Merged [5192]: fixes #1982 : changed the element used for width measurement due IE6 bug
Merged [5194]: Implements #1928 (cellstylegenerator row styling). Fixes #1985 (cell style off-by-one w/ rowheaders)
Merged [5196]: fixes #1986 (tabindex missing from client side)
Merged [5197]: Minor changes for tabIndex definition.
Merged [5198]: TabIndex? definition fix for Select
Merged [5201]: Fixed height/width typo in ITextField
Merged [5202]: fixes #1987 (bad variable names caused exceptions -> all sub windows not rendered)
Merged [5203]: Fixed used space calculation for ExpandLayout?
Merged [5204]: addItem(Object[],Object) now ignores generated columns. Fixes #1967.
Merged [5205]: Cursor position updated as needed after each addComponent(). Fixes #1972
Merged [5207]: fixes #1988 (Window moving weirdness with undefined width)
Merged [5210]: cleaning WebContent?/ITMILL directory
Merged [5211]: cleaning WebContent? directory
Merged [5212]: added test case
Merged [5213]: fixes #1969
Merged [5214]: Faulty if-clause caused ill-placed popup in some cases. Fixes #1886
Merged [5216]: Filtering no longer reacts to shift/ctrl/alt, fixes #1947
Merged [5221]: Now implements ValueChangeNotifier?. Fixes #1978.
Merged [5224]: setContainerDataSource() now accepts null. Fixes #1971.
Merged [5232]: Displayed empty if value==null even if nullselection is not allowed. Fixes #1996
Merged [5233]: Unified constructors + getter required, setter not; fixes #1998 and really-fixes #1076
Merged [5234]: Fixes #1995: Cannot add items to IndexedContainer when using filters
Merged [5235]: Fixes #2000 : AbstractComponent? parses size "100" incorrectly
Merged [5239]: Separate scrollbars for overly-wide errormessages and descriptions. Fixes #1898
Merged [5242]: Fixes for #2002 and #1642 - improved exception handling in CommunicationManager?
Merged [5243]: setPageLength() no longer resets scroll position (fixes #1952), setCurrentPageFirst*() resets page buffer.
Merged [5248]: fixes #2008, client side did not update selection in some situations
Merged [5249]: Fixes #1230 - NPE in AbstractSelect?.select and allow selecting null -> NullSelectionItem?
Merged [5250]: Made #1642 fix more generic by moving implementation to AbstractComponent?
Merged [5252]: Fixed #677 disabling components inside a disabled container
Merged [5253]: Fixed #677 for Form
Merged [5254]: Fixes #2005 (server-side scrolling of table broken)
Merged [5255]: #1986 (tabindex for some selects)
Merged [5260]: fixes #1973, changed cache row fetching to be more lazy - no re-fetching for rendered rows, but may affect one extra fetch in some situations.
Merged [5261]: Fixes #1975 - CustomLayout? template can be specified in java
Merged [5277]: enabled editable mode in table (broken since [5243]

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • branches/5.2/src/com/itmill/toolkit/ui/GridLayout.java

    r4793 r5279  
    190190        } 
    191191 
     192        // update cursor position, if it's within this area; use first position 
     193        // outside this area, even if it's occupied 
     194        if (cursorX >= column1 && cursorX <= column2 && cursorY >= row1 
     195                && cursorY <= row2) { 
     196            cursorX = column2 + 1; 
     197            if (cursorX >= cols) { 
     198                cursorX = 0; 
     199                cursorY = (column1 == 0 ? row2 : row1) + 1; 
     200            } else { 
     201                cursorY = row1; 
     202            } 
     203        } 
     204 
    192205        requestRepaint(); 
    193206    }