diff options
| author | Gord Allott <gord.allott@canonical.com> | 2010-12-15 17:09:41 +0000 |
|---|---|---|
| committer | Gord Allott <gord.allott@canonical.com> | 2010-12-15 17:09:41 +0000 |
| commit | 4997cd96ecdf61f201f335980173cb5bd871703f (patch) | |
| tree | 2b7e4a8bec2bd183e257ec4b2fc870a6654b60a7 /src | |
| parent | 358b550c60cbca56287148e34ce2d1bf20b97046 (diff) | |
slight re-positioning
(bzr r701.2.6)
Diffstat (limited to 'src')
| -rw-r--r-- | src/PlacesController.cpp | 9 | ||||
| -rw-r--r-- | src/PlacesView.cpp | 12 | ||||
| -rw-r--r-- | src/unity.cpp | 1 |
3 files changed, 4 insertions, 18 deletions
diff --git a/src/PlacesController.cpp b/src/PlacesController.cpp index c08b15812..93967f443 100644 --- a/src/PlacesController.cpp +++ b/src/PlacesController.cpp @@ -60,15 +60,11 @@ PlacesController::~PlacesController () void PlacesController::Show () { // show called - g_debug ("Places Show"); _Window->Show (); - } void PlacesController::Hide () { - g_debug ("Places Hide"); - _Window->Hide (); } @@ -84,13 +80,14 @@ void PlacesController::ToggleShowHide () void PlacesController::WindowConfigureCallback(int WindowWidth, int WindowHeight, nux::Geometry& geo, void *user_data) { - geo = nux::Geometry(0, 0, 1024, 600); + GdkScreen *screen = gdk_screen_get_default (); + int height = gdk_screen_get_height (screen) - 12; + geo = nux::Geometry(30, 12, 1024, height); } void PlacesController::ExternalActivation (GVariant *data, void *val) { - g_debug ("external activation"); if (g_getenv ("UNITY_ENABLE_PLACES")) { PlacesController *self = (PlacesController*)val; diff --git a/src/PlacesView.cpp b/src/PlacesView.cpp index 1e456a7ae..a4cc66e73 100644 --- a/src/PlacesView.cpp +++ b/src/PlacesView.cpp @@ -29,14 +29,6 @@ NUX_IMPLEMENT_OBJECT_TYPE (PlacesView); PlacesView::PlacesView (NUX_FILE_LINE_DECL) : nux::BaseWindow("", NUX_FILE_LINE_PARAM) { - //~ SetBaseSize (800, 600); - //SetWidth (800); - //SetHeight (600); - //~ SetBaseX (0); - //~ SetBaseY (200); - //~ SetMaximumSize (600, 200); - //~ SetMinimumSize (600, 200); - //SetGeometry (nux::Geometry (0, 0, 100, 100)); Hide (); } @@ -81,8 +73,6 @@ long PlacesView::ProcessEvent(nux::IEvent &ievent, long TraverseInfo, long Proce void PlacesView::Draw(nux::GraphicsEngine& GfxContext, bool force_draw) { - nux::GetPainter().PaintBackground (GfxContext, GetGeometry() ); - nux::Color *color = new nux::Color (0.9, 0.3, 0.1, 1.0); nux::GetPainter ().Paint2DQuadColor (GfxContext, GetGeometry (), *color); } @@ -112,8 +102,6 @@ void PlacesView::Show () ShowWindow (true, false); EnableInputWindow (true, 1); GrabPointer (); - SetBaseX (0); - SetBaseY (0); NeedRedraw (); } diff --git a/src/unity.cpp b/src/unity.cpp index 30b1c014e..9542bc911 100644 --- a/src/unity.cpp +++ b/src/unity.cpp @@ -439,6 +439,7 @@ UnityScreen::UnityScreen (CompScreen *screen) : g_timeout_add (0, &UnityScreen::initPluginActions, this); END_FUNCTION (); + g_timeout_add (5000, write_logger_data_to_disk, NULL); } UnityScreen::~UnityScreen () |
