diff options
Diffstat (limited to 'src/Screen.cc')
-rw-r--r-- | src/Screen.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 8128384..2d58a01 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -33,6 +33,7 @@ | |||
33 | #include "Netizen.hh" | 33 | #include "Netizen.hh" |
34 | 34 | ||
35 | #include "FocusControl.hh" | 35 | #include "FocusControl.hh" |
36 | #include "ScreenPlacement.hh" | ||
36 | 37 | ||
37 | // themes | 38 | // themes |
38 | #include "FbWinFrameTheme.hh" | 39 | #include "FbWinFrameTheme.hh" |
@@ -184,9 +185,7 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager &rm, | |||
184 | menu_delay(rm, 0, scrname + ".menuDelay", altscrname+".MenuDelay"), | 185 | menu_delay(rm, 0, scrname + ".menuDelay", altscrname+".MenuDelay"), |
185 | menu_delay_close(rm, 0, scrname + ".menuDelayClose", altscrname+".MenuDelayClose"), | 186 | menu_delay_close(rm, 0, scrname + ".menuDelayClose", altscrname+".MenuDelayClose"), |
186 | menu_mode(rm, FbTk::MenuTheme::DELAY_OPEN, scrname+".menuMode", altscrname+".MenuMode"), | 187 | menu_mode(rm, FbTk::MenuTheme::DELAY_OPEN, scrname+".menuMode", altscrname+".MenuMode"), |
187 | placement_policy(rm, ROWSMARTPLACEMENT, scrname+".windowPlacement", altscrname+".WindowPlacement"), | 188 | |
188 | row_direction(rm, LEFTRIGHT, scrname+".rowPlacementDirection", altscrname+".RowPlacementDirection"), | ||
189 | col_direction(rm, TOPBOTTOM, scrname+".colPlacementDirection", altscrname+".ColPlacementDirection"), | ||
190 | gc_line_width(rm, 1, scrname+".overlay.lineWidth", altscrname+".Overlay.LineWidth"), | 189 | gc_line_width(rm, 1, scrname+".overlay.lineWidth", altscrname+".Overlay.LineWidth"), |
191 | gc_line_style(rm, | 190 | gc_line_style(rm, |
192 | FbTk::GContext::LINESOLID, | 191 | FbTk::GContext::LINESOLID, |
@@ -238,6 +237,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm, | |||
238 | m_name(screenname), | 237 | m_name(screenname), |
239 | m_altname(altscreenname), | 238 | m_altname(altscreenname), |
240 | m_focus_control(new FocusControl(*this)), | 239 | m_focus_control(new FocusControl(*this)), |
240 | m_placement_strategy(new ScreenPlacement(*this)), | ||
241 | m_xinerama_headinfo(0), | 241 | m_xinerama_headinfo(0), |
242 | m_shutdown(false) { | 242 | m_shutdown(false) { |
243 | 243 | ||
@@ -446,7 +446,10 @@ BScreen::~BScreen() { | |||
446 | 446 | ||
447 | // TODO fluxgen: check if this is the right place | 447 | // TODO fluxgen: check if this is the right place |
448 | delete [] m_head_areas; | 448 | delete [] m_head_areas; |
449 | |||
449 | delete m_focus_control; | 450 | delete m_focus_control; |
451 | delete m_placement_strategy; | ||
452 | |||
450 | } | 453 | } |
451 | 454 | ||
452 | void BScreen::initWindows() { | 455 | void BScreen::initWindows() { |