Skip to content
This repository was archived by the owner on Jun 1, 2025. It is now read-only.

Commit 2d3847b

Browse files
Ghislain BeaulacGhislain Beaulac
authored andcommitted
fix a small visual issue encountered on grid that don't have scrolling. Last filter gets cut because of the header row auto-resize.
1 parent d1ee6cb commit 2d3847b

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

src/app/examples/grid-graphql.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export class GridGraphqlComponent implements OnInit {
4848
selectOptions: [ { value: '', label: '' }, { value: 'male', label: 'male' }, { value: 'female', label: 'female' } ]
4949
}
5050
},
51-
{ id: 'company', name: 'Company', field: 'company' }
51+
{ id: 'company', name: 'Company', field: 'company', filterable: true }
5252
];
5353

5454
this.gridOptions = {

src/app/modules/angular-slickgrid/global-grid-options.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ export const GlobalGridOptions: GridOption = {
2929
gridMenu: {
3030
columnTitle: 'Columns',
3131
iconCssClass: 'fa fa-bars',
32-
menuWidth: 16
32+
menuWidth: 16,
33+
resizeOnShowHeaderRow: false
3334
},
3435
headerRowHeight: 35,
3536
multiColumnSort: true,

src/app/modules/angular-slickgrid/services/controlAndPlugin.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,6 @@ export class ControlAndPluginService {
168168
options.gridMenu.customItems = options.gridMenu.customItems || [];
169169
this.addGridMenuCustomCommands(options);
170170

171-
options.gridMenu.resizeOnShowHeaderRow = options.showHeaderRow;
171+
// options.gridMenu.resizeOnShowHeaderRow = options.showHeaderRow;
172172
}
173173
}

src/app/modules/angular-slickgrid/styles/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ $header-input-width: 100% !default; //
5050
$header-input-padding: 0 6px !default; // padding of the filter form element (input, textarea, select)
5151
$header-row-background-color: #ffffff !default;
5252
$header-row-count: 2 !default; // how many rows to display on the header
53+
$header-row-filter-padding: 4px !default;
5354
$header-column-height: (16px * $header-row-count) !default; // header is calculated by rows to show
5455
$header-border-top: 0 none !default;
5556
$header-border-right: 0 none !default;
@@ -96,7 +97,6 @@ $grid-menu-link-background-color: #ffffff !default;
9697
$grid-menu-box-shadow: 2px 2px 2px silver !default;
9798
$grid-menu-icon-font-size: 14px;
9899

99-
100100
/* Editors */
101101
$large-editor-background-color: #ffffff !default;
102102
$large-editor-border: 2px solid gray !default;

src/app/modules/angular-slickgrid/styles/slick-bootstrap.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
.slick-headerrow-columns {
157157
.slick-headerrow-column {
158158
border: none;
159-
padding: 4px 5px;
159+
padding: $header-row-filter-padding;
160160
background: $header-row-background-color;
161161
}
162162
.slick-headerrow-column input,

0 commit comments

Comments
 (0)