Check-in [4bb4842f2d]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:small improvement in tktable regarding row/col stretch mode
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 4bb4842f2dd0e12d18afb94de8fae34976d31090
User & Date: chw 2019-10-22 03:51:12
Context
2019-10-25
17:51
add tklib upstream changes check-in: e27998a5e6 user: chw tags: trunk
2019-10-22
03:52
merge with trunk check-in: 3397a3fa42 user: chw tags: wtf-8-experiment
03:51
small improvement in tktable regarding row/col stretch mode check-in: 4bb4842f2d user: chw tags: trunk
2019-10-21
12:36
tweaks for topcua in undroidwish/vanillawish build scripts for win32/64 check-in: e5d53c9b19 user: chw tags: trunk
Changes

Changes to jni/tktable/generic/tkTable.c.

1878
1879
1880
1881
1882
1883
1884





1885








1886



1887
1888
1889
1890
1891
1892
1893
			&x, &y, &width, &height, 0);
		/* We have to adjust the coords back onto the visual display */
		urow = row+tablePtr->rowOffset;
		rowPtr = FindRowColTag(tablePtr, urow, ROW);
	    }

	    /* Constrain drawn size to the visual boundaries */





	    if (width > boundW-x)	{ width  = boundW-x; }








	    if (height > boundH-y)	{ height = boundH-y; }




	    /* Cache the col in user terms */
	    ucol = col+tablePtr->colOffset;

	    /* put the use cell ref into a buffer for the hash lookups */
	    TableMakeArrayIndex(urow, ucol, buf);
	    if (cellType != CELL_HIDDEN) {







>
>
>
>
>
|
>
>
>
>
>
>
>
>
|
>
>
>







1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
			&x, &y, &width, &height, 0);
		/* We have to adjust the coords back onto the visual display */
		urow = row+tablePtr->rowOffset;
		rowPtr = FindRowColTag(tablePtr, urow, ROW);
	    }

	    /* Constrain drawn size to the visual boundaries */
	    if (tablePtr->colStretch == STRETCH_MODE_NONE) {
		if (x >= boundW && width > boundW - x) {
		    width = boundW - x;
		}
	    } else {
		if (width > boundW - x) {
		    width = boundW - x;
		}
	    }
	    if (tablePtr->rowStretch == STRETCH_MODE_NONE) {
		if (y >= boundH && height > boundH - y) {
		    height = boundH - y;
		}
	    } else {
		if (height > boundH - y) {
		    height = boundH - y;
		}
	    }

	    /* Cache the col in user terms */
	    ucol = col+tablePtr->colOffset;

	    /* put the use cell ref into a buffer for the hash lookups */
	    TableMakeArrayIndex(urow, ucol, buf);
	    if (cellType != CELL_HIDDEN) {