comparison: ui/gtk/window.c
ui/gtk/window.c
- changeset 1193
- 28c603de3f21
- parent 1137
- db9c3838fd4d
- child 1194
- 91696f7fa475
equal
deleted
inserted
replaced
| 1192:96858abf075a | 1193:28c603de3f21 |
|---|---|
| 284 gtk_paned_set_end_child(GTK_PANED(content), right_panel); | 284 gtk_paned_set_end_child(GTK_PANED(content), right_panel); |
| 285 | 285 |
| 286 g_object_set_data(G_OBJECT(obj->widget), "ui_window_splitview", content); | 286 g_object_set_data(G_OBJECT(obj->widget), "ui_window_splitview", content); |
| 287 g_object_set_data(G_OBJECT(obj->widget), "ui_left_panel", vbox); | 287 g_object_set_data(G_OBJECT(obj->widget), "ui_left_panel", vbox); |
| 288 g_object_set_data(G_OBJECT(obj->widget), "ui_right_panel", right_vbox); | 288 g_object_set_data(G_OBJECT(obj->widget), "ui_right_panel", right_vbox); |
| 289 g_object_set_data(G_OBJECT(obj->widget), "ui_left_panel_top", toolbar_view); | |
| 290 g_object_set_data(G_OBJECT(obj->widget), "ui_right_panel_top", right_panel); | |
| 289 } | 291 } |
| 290 | 292 |
| 291 GtkWidget *content_box = vbox; | 293 GtkWidget *content_box = vbox; |
| 292 | 294 |
| 293 if(sidebar) { | 295 if(sidebar) { |
| 386 PANED_SET_CHILD2(content_paned, right_content_box); | 388 PANED_SET_CHILD2(content_paned, right_content_box); |
| 387 | 389 |
| 388 g_object_set_data(G_OBJECT(obj->widget), "ui_window_splitview", content_paned); | 390 g_object_set_data(G_OBJECT(obj->widget), "ui_window_splitview", content_paned); |
| 389 g_object_set_data(G_OBJECT(obj->widget), "ui_left_panel", content_box); | 391 g_object_set_data(G_OBJECT(obj->widget), "ui_left_panel", content_box); |
| 390 g_object_set_data(G_OBJECT(obj->widget), "ui_right_panel", right_content_box); | 392 g_object_set_data(G_OBJECT(obj->widget), "ui_right_panel", right_content_box); |
| 393 g_object_set_data(G_OBJECT(obj->widget), "ui_left_panel_top", content_box); | |
| 394 g_object_set_data(G_OBJECT(obj->widget), "ui_right_panel_top", right_content_box); | |
| 391 } else { | 395 } else { |
| 392 PANED_SET_CHILD2(paned, content_box); | 396 PANED_SET_CHILD2(paned, content_box); |
| 393 } | 397 } |
| 394 | 398 |
| 395 BOX_ADD_EXPAND(GTK_BOX(vbox), paned); | 399 BOX_ADD_EXPAND(GTK_BOX(vbox), paned); |
| 476 } | 480 } |
| 477 | 481 |
| 478 UIEXPORT void ui_splitview_window_set_visible(UiObject *obj, int pane, UiBool visible) { | 482 UIEXPORT void ui_splitview_window_set_visible(UiObject *obj, int pane, UiBool visible) { |
| 479 GtkWidget *panel = NULL; | 483 GtkWidget *panel = NULL; |
| 480 if(pane == 0) { | 484 if(pane == 0) { |
| 481 panel = g_object_get_data(G_OBJECT(obj->widget), "ui_left_panel"); | 485 panel = g_object_get_data(G_OBJECT(obj->widget), "ui_left_panel_top"); |
| 482 } else if(pane == 1) { | 486 } else if(pane == 1) { |
| 483 panel = g_object_get_data(G_OBJECT(obj->widget), "ui_right_panel"); | 487 panel = g_object_get_data(G_OBJECT(obj->widget), "ui_right_panel_top"); |
| 484 } | 488 } |
| 485 | 489 |
| 486 if(panel == NULL) { | 490 if(panel == NULL) { |
| 487 fprintf(stderr, "Error: obj is not a splitview window or invalid pane %d specified\n", pane); | 491 fprintf(stderr, "Error: obj is not a splitview window or invalid pane %d specified\n", pane); |
| 488 return; | 492 return; |
