IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor: take submenu into account PR #12796

Browse Source
This commit is contained in:
Torkel Ödegaard 2018-08-05 11:27:02 +02:00
parent b1b8a38061
commit 624f3a0173
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/features/dashboard/dashboard_ctrl.ts
View File

@ -62,6 +62,7 @@ export class DashboardCtrl implements PanelContainer {
.finally(() => { .finally(() => {
this.dashboard = dashboard; this.dashboard = dashboard;
this.dashboard.processRepeats(); this.dashboard.processRepeats();
this.dashboard.updateSubmenuVisibility();
this.dashboard.autoFitPanels(window.innerHeight); this.dashboard.autoFitPanels(window.innerHeight);
this.unsavedChangesSrv.init(dashboard, this.$scope); this.unsavedChangesSrv.init(dashboard, this.$scope);
@ -71,8 +72,6 @@ export class DashboardCtrl implements PanelContainer {
this.dashboardViewState = this.dashboardViewStateSrv.create(this.$scope); this.dashboardViewState = this.dashboardViewStateSrv.create(this.$scope);
this.keybindingSrv.setupDashboardBindings(this.$scope, dashboard); this.keybindingSrv.setupDashboardBindings(this.$scope, dashboard);
this.dashboard.updateSubmenuVisibility();
this.setWindowTitleAndTheme(); this.setWindowTitleAndTheme();
this.$scope.appEvent('dashboard-initialized', dashboard); this.$scope.appEvent('dashboard-initialized', dashboard);

14
public/app/features/dashboard/dashboard_model.ts
View File

@ -836,16 +836,22 @@ export class DashboardModel {
return; return;
} }
let currentGridHeight = Math.max( const currentGridHeight = Math.max(
...this.panels.map(panel => { ...this.panels.map(panel => {
return panel.gridPos.h + panel.gridPos.y; return panel.gridPos.h + panel.gridPos.y;
}) })
); );
//Consider navbar and submenu controls, padding and margin // Consider navbar and submenu controls, padding and margin
let visibleHeight = window.innerHeight - 55 - 20; let visibleHeight = window.innerHeight - 55 - 20;
let visibleGridHeight = Math.floor(visibleHeight / (GRID_CELL_HEIGHT + GRID_CELL_VMARGIN));
let scaleFactor = currentGridHeight / visibleGridHeight; // Remove submenu if visible
if (this.meta.submenuEnabled) {
visibleHeight -= 50;
}
const visibleGridHeight = Math.floor(visibleHeight / (GRID_CELL_HEIGHT + GRID_CELL_VMARGIN));
const scaleFactor = currentGridHeight / visibleGridHeight;
this.panels.forEach((panel, i) => { this.panels.forEach((panel, i) => {
panel.gridPos.y = Math.round(panel.gridPos.y / scaleFactor) || 1; panel.gridPos.y = Math.round(panel.gridPos.y / scaleFactor) || 1;